What's cooking (2014/06 #04)
Junio C Hamano committed
Jun 17, 2014 at 15:16 UTC
2435433fd7dc7ce0d15ddd92b07b5745aa316f6f
1 file changed
+672
-614
whats-cooking.txt
+672
-614
@@ -1,19 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2014, #03; Tue, 10)
4
-X-master-at: 50f84e34a1b0bb893327043cb0c491e02ced9ff5
5
-X-next-at: 8cd8cf873f2edce97930416c82a1a2213d488ee4
3
+Subject: What's cooking in git.git (Jun 2014, #04; Tue, 17)
4
+X-master-at: cb682f8cfe63ecd0da08a526f404d295e51e3ab1
5
+X-next-at: f681aa8b2164b7263bd68f49cd3bebd6bf560b78
6
7
-What's cooking in git.git (Jun 2014, #03; Tue, 10)
7
+What's cooking in git.git (Jun 2014, #04; Tue, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The tip of 'next' has been rewound. I originally wanted to eject
15
-many younger topics and slim the branch down, but decided against
16
-it.
14
+Many topics that have been cooking in 'next' during the previous
15
+cycle, totalling close to 300 individual patches, are in 'master'
16
+now. We have also accumulated some fixes we need to merge down to
17
+'maint' and cut a v2.0.1 sometime next week.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -23,248 +24,538 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
26
-* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
27
- (merged to 'next' on 2014-06-06 at 8b04440)
28
- + update-index: fix segfault with missing --cacheinfo argument
27
+* mt/patch-id-stable (2014-06-10) 1 commit
28
+ - patch-id: change default to stable
29
30
- "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
30
+ Teaches "git patch-id" to compute the patch ID that does not change
31
+ when the files in a single patch is reordered. As this new algorithm
32
+ is backward incompatible, the last bit to flip it to be the default
33
+ is left out of 'master' for now.
34
35
33
-* jc/shortlog-ref-exclude (2014-06-04) 1 commit
34
- (merged to 'next' on 2014-06-06 at a358cbe)
35
- + shortlog: allow --exclude=<glob> to be passed
36
+* as/pretty-truncate (2014-05-21) 5 commits
37
+ (merged to 'next' on 2014-06-10 at d8147a2)
38
+ + pretty.c: format string with truncate respects logOutputEncoding
39
+ + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
40
+ + t4205 (log-pretty-format): use `tformat` rather than `format`
41
+ + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
42
+ + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
43
37
- "shortlog --opts and args" and "log --opts and args | shortlog"
38
- should be equivalent, but the former did not grok some options.
44
+ Originally merged to 'next' on 2014-05-23
45
46
41
-* lt/request-pull (2014-06-02) 1 commit
42
- (merged to 'next' on 2014-06-06 at ad4d79d)
43
- + fix brown paper bag breakage in t5150-request-pull.sh
47
+* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
48
+ (merged to 'next' on 2014-06-10 at eddb5bc)
49
+ + transport-helper.c: rearrange xcalloc arguments
50
+ + remote.c: rearrange xcalloc arguments
51
+ + reflog-walk.c: rearrange xcalloc arguments
52
+ + pack-revindex.c: rearrange xcalloc arguments
53
+ + notes.c: rearrange xcalloc arguments
54
+ + imap-send.c: rearrange xcalloc arguments
55
+ + http-push.c: rearrange xcalloc arguments
56
+ + diff.c: rearrange xcalloc arguments
57
+ + config.c: rearrange xcalloc arguments
58
+ + commit.c: rearrange xcalloc arguments
59
+ + builtin/remote.c: rearrange xcalloc arguments
60
+ + builtin/ls-remote.c: rearrange xcalloc arguments
61
62
+ Originally merged to 'next' on 2014-06-06
63
46
-* mn/sideband-no-ansi (2014-06-02) 1 commit
47
- (merged to 'next' on 2014-06-06 at f61fc73)
48
- + sideband.c: do not use ANSI control sequence on non-terminal
64
+ Like calloc(3), xcalloc() takes nmemb and then size.
65
66
51
-* na/no-http-test-in-the-middle (2014-05-30) 1 commit
52
- (merged to 'next' on 2014-06-06 at e195615)
53
- + t5538: move http push tests out to t5542
67
+* cb/byte-order (2014-05-30) 3 commits
68
+ (merged to 'next' on 2014-06-10 at 63db8ee)
69
+ + compat/bswap.h: fix endianness detection
70
+ + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
71
+ + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
72
73
+ Originally merged to 'next' on 2014-05-30
74
56
-* pb/trim-trailing-spaces (2014-06-02) 1 commit
57
- (merged to 'next' on 2014-06-06 at 741efc2)
58
- + dir.c:trim_trailing_spaces(): fix for " \ " sequence
75
+ Compatibility enhancement for Solaris.
76
60
- Fix an error in parsing of .gitignore files that use a trailing
61
- "\ " to mark pathnames that end with a SP.
77
78
+* cc/replace-edit (2014-05-19) 10 commits
79
+ (merged to 'next' on 2014-06-10 at ff69722)
80
+ + Documentation: replace: describe new --edit option
81
+ + replace: add --edit to usage string
82
+ + replace: add tests for --edit
83
+ + replace: die early if replace ref already exists
84
+ + replace: refactor checking ref validity
85
+ + replace: make sure --edit results in a different object
86
+ + replace: add --edit option
87
+ + replace: factor object resolution out of replace_object
88
+ + replace: use OPT_CMDMODE to handle modes
89
+ + replace: refactor command-mode determination
90
+ (this branch is used by cc/replace-graft.)
91
64
-* rs/mailinfo-header-cmp (2014-06-02) 1 commit
65
- (merged to 'next' on 2014-06-06 at 5e856f4)
66
- + mailinfo: use strcmp() for string comparison
92
+ Originally merged to 'next' on 2014-05-19
93
68
- Avoid running over the end of header string while parsing an
69
- incoming e-mail message to extract the patch.
94
+ "git replace" learns a new "--edit" option.
95
71
---------------------------------------------------
72
-[New Topics]
96
74
-* ep/avoid-test-a-o (2014-06-10) 21 commits
75
- - git-submodule.sh: avoid "echo" path-like values
76
- - SQUASH: misconversion breakage fix
77
- - git-submodule.sh: avoid "test <cond> -a/-o <cond>"
78
- - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
79
- - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
80
- - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
81
- - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
82
- - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
83
- - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
84
- - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
85
- - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
86
- - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
87
- - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
88
- - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
89
- - git-bisect.sh: avoid "test <cond> -a/-o <cond>"
90
- - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
91
- - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
92
- - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
93
- - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
94
- - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
95
- - check_bindir: avoid "test <cond> -a/-o <cond>"
97
+* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
98
+ (merged to 'next' on 2014-06-10 at 4560669)
99
+ + refs.c: optimize check_refname_component()
100
+ (this branch is used by dt/refs-check-refname-component-sse42.)
101
102
+ Originally merged to 'next' on 2014-06-06
103
98
-* jc/revision-dash-count-parsing (2014-06-09) 1 commit
99
- (merged to 'next' on 2014-06-10 at 1aeca19)
100
- + revision: parse "git log -<count>" more carefully
104
102
- "git log -2master" is a common typo that shows two commits starting
103
- from whichever random branch that is not 'master' that happens to
104
- be checked out currently.
105
+* fc/remote-helper-refmap (2014-04-21) 8 commits
106
+ (merged to 'next' on 2014-06-10 at 8cd8cf8)
107
+ + transport-helper: remove unnecessary strbuf resets
108
+ + transport-helper: add support to delete branches
109
+ + fast-export: add support to delete refs
110
+ + fast-import: add support to delete refs
111
+ + transport-helper: add support to push symbolic refs
112
+ + transport-helper: add support for old:new refspec
113
+ + fast-export: add new --refspec option
114
+ + fast-export: improve argument parsing
115
106
- Will merge to 'master'.
116
+ Originally merged to 'next' on 2014-04-22
117
118
+ Allow remote-helper/fast-import based transport to rename the refs
119
+ while transferring the history.
120
109
-* jc/test-lazy-prereq (2014-06-09) 7 commits
110
- - tests: drop GIT_*_TIMING_TESTS environment variable support
111
- (merged to 'next' on 2014-06-10 at 4f774f7)
112
- + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
113
- + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
114
- + t3302: do not chdir around in the primary test process
115
- + t3302: coding style updates
116
- + test: turn USR_BIN_TIME into a lazy prerequisite
117
- + test: turn EXPENSIVE into a lazy prerequisite
121
119
- Test-script clean-up. The last step might be controversial.
122
+* ib/test-selectively-run (2014-06-06) 4 commits
123
+ (merged to 'next' on 2014-06-10 at 1235570)
124
+ + t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
125
+ + test-lib: '--run' to run only specific tests
126
+ + test-lib: tests skipped by GIT_SKIP_TESTS say so
127
+ + test-lib: document short options in t/README
128
121
- Will merge to 'master' except for the last one.
129
+ Originally merged to 'next' on 2014-06-06
130
131
+ Allow specifying only certain individual test pieces to be run
132
+ using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
133
124
-* jk/commit-buffer-length (2014-06-10) 16 commits
125
- - SQUASH to 12/15???
126
- - commit: record buffer length in cache
127
- - commit: convert commit->buffer to a slab
128
- - commit-slab: provide a static initializer
129
- - use get_commit_buffer everywhere
130
- - convert logmsg_reencode to get_commit_buffer
131
- - use get_commit_buffer to avoid duplicate code
132
- - use get_cached_commit_buffer where appropriate
133
- - provide helpers to access the commit buffer
134
- - provide a helper to set the commit buffer
135
- - provide a helper to free commit buffer
136
- - sequencer: use logmsg_reencode in get_message
137
- - logmsg_reencode: return const buffer
138
- - do not create "struct commit" with xcalloc
139
- - commit: push commit_index update into alloc_commit_node
140
- - alloc: include any-object allocations in alloc_report
134
142
- Expecting a reroll.
135
+* jk/argv-array-for-child-process (2014-05-15) 7 commits
136
+ (merged to 'next' on 2014-06-10 at 07a167b)
137
+ + argv-array: drop "detach" code
138
+ + get_importer: use run-command's internal argv_array
139
+ + get_exporter: use argv_array
140
+ + get_helper: use run-command's internal argv_array
141
+ + git_connect: use argv_array
142
+ + run_column_filter: use argv_array
143
+ + run-command: store an optional argv_array
144
145
+ Originally merged to 'next' on 2014-05-21
146
145
-* jm/api-strbuf-doc (2014-06-09) 1 commit
146
- (merged to 'next' on 2014-06-10 at 831aa30)
147
- + api-strbuf.txt minor typos
147
149
- Will merge to 'master'.
148
+* jk/complete-merge-pull (2014-05-27) 2 commits
149
+ (merged to 'next' on 2014-06-10 at d1524c5)
150
+ + completion: add missing options for git-merge
151
+ + completion: add a note that merge options are shared
152
153
+ Originally merged to 'next' on 2014-06-06
154
152
-* rs/more-starts-with (2014-06-09) 1 commit
153
- (merged to 'next' on 2014-06-10 at efcd02e)
154
- + Use starts_with() for C strings instead of memcmp()
155
+ The completion code did not know about quite a few options that are
156
+ common between "git merge" and "git pull", and a couple of options
157
+ unique to "git merge".
158
156
- Will merge to 'master'.
159
160
+* jk/daemon-tolower (2014-05-23) 1 commit
161
+ (merged to 'next' on 2014-06-10 at f3c549d)
162
+ + daemon/config: factor out duplicate xstrdup_tolower
163
159
-* sk/mingw-dirent (2014-06-09) 5 commits
160
- - Win32 dirent: improve dirent implementation
161
- - Win32 dirent: clarify #include directives
162
- - Win32 dirent: change FILENAME_MAX to MAX_PATH
163
- - Win32 dirent: remove unused dirent.d_reclen member
164
- - Win32 dirent: remove unused dirent.d_ino member
164
+ Originally merged to 'next' on 2014-05-23
165
166
167
-* sk/mingw-main (2014-06-10) 2 commits
168
- - mingw: avoid const warning
169
- - Win32: move main macro to a function
170
- (this branch is used by sk/mingw-uni-console; uses sk/windows-unc-path.)
167
+* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
168
+ (merged to 'next' on 2014-06-10 at 984862b)
169
+ + run_diff_files: do not look at uninitialized stat data
170
171
+ Originally merged to 'next' on 2014-05-21
172
173
-* sk/mingw-uni-console (2014-06-10) 6 commits
174
- - Win32: fix broken pipe detection
175
- - Win32: Thread-safe windows console output
176
- - Win32: add Unicode conversion functions
177
- - Win32: warn if the console font doesn't support Unicode
178
- - Win32: detect console streams more reliably
179
- - Win32: support Unicode console output
180
- (this branch uses sk/mingw-main and sk/windows-unc-path.)
173
182
- Could somebody from the mingw land double check that I queued the
183
- right versions for the above three, as there were many iterations
184
- and I wasn't paying attention.
174
+* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
175
+ (merged to 'next' on 2014-06-10 at 0cd28d7)
176
+ + move "--follow needs one pathspec" rule to diff_setup_done
177
186
- After that will merge to 'next' and to 'master'.
178
+ Originally merged to 'next' on 2014-05-23
179
180
189
-* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
190
- (merged to 'next' on 2014-06-10 at 374082c)
191
- + t5551: fix the 50,000 tag test
181
+* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
182
+ (merged to 'next' on 2014-06-10 at 745b05c)
183
+ + t/lib-httpd: require SANITY prereq
184
193
- Will merge to 'master'.
185
+ Originally merged to 'next' on 2014-05-21
186
187
196
-* jk/repack-pack-keep-objects (2014-06-10) 3 commits
197
- - repack: s/write_bitmap/&s/ in code
198
- - repack: respect pack.writebitmaps
199
- - repack: do not accidentally pack kept objects by default
200
- (this branch is used by jk/repack-pack-writebitmaps-config.)
188
+* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
189
+ (merged to 'next' on 2014-06-10 at 713ebe0)
190
+ + error_resolve_conflict: drop quotations around operation
191
+ + error_resolve_conflict: rewrap advice message
192
202
- Will merge to 'next'.
193
+ Originally merged to 'next' on 2014-06-06
194
195
205
-* jk/repack-pack-writebitmaps-config (2014-06-10) 3 commits
206
- - repack: introduce repack.writeBitmaps config option
207
- - repack: simplify handling of --write-bitmap-index
208
- - pack-objects: stop respecting pack.writebitmaps
209
- (this branch uses jk/repack-pack-keep-objects.)
196
+* jk/http-errors (2014-05-27) 8 commits
197
+ (merged to 'next' on 2014-06-10 at 30e9212)
198
+ + http: default text charset to iso-8859-1
199
+ + remote-curl: reencode http error messages
200
+ + strbuf: add strbuf_reencode helper
201
+ + http: optionally extract charset parameter from content-type
202
+ + http: extract type/subtype portion of content-type
203
+ + t5550: test display of remote http error messages
204
+ + t/lib-httpd: use write_script to copy CGI scripts
205
+ + test-lib: preserve GIT_CURL_VERBOSE from the environment
206
211
- Will merge to 'next'.
207
+ Originally merged to 'next' on 2014-06-06
208
209
+ Propagate the error messages from the webserver better to the
210
+ client coming over the HTTP transport.
211
214
-* mg/verify-commit (2014-06-10) 3 commits
215
- - verify-commit: scriptable commit signature verification
216
- - gpg-interface: provide access to the payload
217
- - pretty: free the gpg status buf
212
219
- Will merge to 'next'.
213
+* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
214
+ (merged to 'next' on 2014-06-10 at 299ea28)
215
+ + open_sha1_file: report "most interesting" errno
216
217
+ Originally merged to 'next' on 2014-05-21
218
222
-* nd/init-restore-env (2014-06-10) 1 commit
223
- - git potty: restore environments after alias expansion
219
225
- Will merge to 'next'.
220
+* jk/strbuf-tolower (2014-05-23) 1 commit
221
+ (merged to 'next' on 2014-06-10 at 01e6983)
222
+ + strbuf: add strbuf_tolower function
223
227
---------------------------------------------------
228
-[Stalled]
224
+ Originally merged to 'next' on 2014-05-23
225
230
-* nd/split-index (2014-06-02) 34 commits
231
- - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
232
- - SQUASH???
233
- - t1700: new tests for split-index mode
234
- - t2104: make sure split index mode is off for the version test
235
- - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
236
- - read-tree: note about dropping split-index mode or index version
237
- - read-tree: force split-index mode off on --index-output
238
- - rev-parse: add --shared-index-path to get shared index path
239
- - update-index --split-index: do not split if $GIT_DIR is read only
240
- - update-index: new options to enable/disable split index mode
241
- - split-index: strip pathname of on-disk replaced entries
242
- - split-index: do not invalidate cache-tree at read time
243
- - split-index: the reading part
244
- - split-index: the writing part
245
- - read-cache: mark updated entries for split index
246
- - read-cache: save deleted entries in split index
247
- - read-cache: mark new entries for split index
248
- - read-cache: split-index mode
249
- - read-cache: save index SHA-1 after reading
250
- - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
251
- - cache-tree: mark istate->cache_changed on prime_cache_tree()
252
- - cache-tree: mark istate->cache_changed on cache tree update
253
- - cache-tree: mark istate->cache_changed on cache tree invalidation
254
- - unpack-trees: be specific what part of the index has changed
255
- - resolve-undo: be specific what part of the index has changed
256
- - update-index: be specific what part of the index has changed
257
- - read-cache: be specific what part of the index has changed
258
- - read-cache: be strict about "changed" in remove_marked_cache_entries()
259
- - read-cache: store in-memory flags in the first 12 bits of ce_flags
260
- - read-cache: relocate and unexport commit_locked_index()
261
- - read-cache: new API write_locked_index instead of write_index/write_cache
262
- - sequencer: do not update/refresh index if the lock cannot be held
263
- - ewah: delete unused ewah_read_mmap_native declaration
264
- - ewah: fix constness of ewah_read_mmap
226
266
- The tip two remind us the need for a minor reroll. If I find time
267
- I could try to squash them myself, but it is low priority for me.
227
+* jl/remote-rm-prune (2014-05-27) 3 commits
228
+ (merged to 'next' on 2014-06-10 at 13259ff)
229
+ + remote prune: optimize "dangling symref" check/warning
230
+ + remote: repack packed-refs once when deleting multiple refs
231
+ + remote rm: delete remote configuration as the last
232
+
233
+ Originally merged to 'next' on 2014-06-06
234
+
235
+ "git remote rm" and "git remote prune" can involve removing many
236
+ refs at once, which is not a very efficient thing to do when very
237
+ many refs exist in the packed-refs file.
238
+
239
+
240
+* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
241
+ (merged to 'next' on 2014-06-10 at fc63847)
242
+ + commit -m: commit staged submodules regardless of ignore config
243
+ + status/commit: show staged submodules regardless of ignore config
244
+
245
+ Originally merged to 'next' on 2014-06-06
246
+
247
+ submodule.*.ignore and diff.ignoresubmodules are used to ignore all
248
+ submodule changes in "diff" output, but it can be confusing to
249
+ apply these configuration values to status and commit.
250
+
251
+ This is a backward-incompatible change, but should be so in a good
252
+ way (aka bugfix).
253
+
254
+
255
+* jm/dedup-test-config (2014-06-05) 1 commit
256
+ (merged to 'next' on 2014-06-10 at 8966f54)
257
+ + t/t7810-grep.sh: remove duplicate test_config()
258
+
259
+ Originally merged to 'next' on 2014-06-06
260
+
261
+
262
+* jm/doc-wording-tweaks (2014-05-28) 1 commit
263
+ (merged to 'next' on 2014-06-10 at 5f2e094)
264
+ + Documentation: wording fixes in the user manual and glossary
265
+
266
+ Originally merged to 'next' on 2014-06-06
267
+
268
+
269
+* jm/format-patch-mail-sig (2014-05-27) 2 commits
270
+ (merged to 'next' on 2014-06-10 at 310f59e)
271
+ + format-patch: add "--signature-file=<file>" option
272
+ + format-patch: make newline after signature conditional
273
+
274
+ Originally merged to 'next' on 2014-06-06
275
+
276
+
277
+* jm/instaweb-apache-24 (2014-05-27) 1 commit
278
+ (merged to 'next' on 2014-06-10 at ecf2048)
279
+ + git-instaweb: add support for Apache 2.4
280
+
281
+ Originally merged to 'next' on 2014-06-06
282
+
283
+
284
+* jm/t9138-style-fix (2014-05-27) 1 commit
285
+ (merged to 'next' on 2014-06-10 at 034f13d)
286
+ + t9138-git-svn-authors-prog.sh fixups
287
+
288
+ Originally merged to 'next' on 2014-06-06
289
+
290
+
291
+* lt/log-auto-decorate (2014-05-30) 1 commit
292
+ (merged to 'next' on 2014-06-10 at f149f4a)
293
+ + git log: support "auto" decorations
294
+
295
+ Originally merged to 'next' on 2014-06-06
296
+
297
+
298
+* nd/daemonize-gc (2014-05-27) 1 commit
299
+ (merged to 'next' on 2014-06-10 at 6fae7b0)
300
+ + gc --auto: do not lock refs in the background
301
+
302
+ Originally merged to 'next' on 2014-06-06
303
+
304
+ "git gc --auto" was recently changed to run in the background to
305
+ give control back early to the end-user sitting in front of the
306
+ terminal, but it forgot that housekeeping involving reflogs should
307
+ be done without other processes competing for accesses to the refs.
308
+
309
+
310
+* ow/config-mailmap-pathname (2014-05-27) 1 commit
311
+ (merged to 'next' on 2014-06-10 at aba4ca2)
312
+ + config: respect '~' and '~user' in mailmap.file
313
+
314
+ Originally merged to 'next' on 2014-06-06
315
+
316
+ mailmap.file configuration names a pathname, hence should honor
317
+ ~/path and ~user/path as its value.
318
+
319
+
320
+* rr/rebase-autostash-fix (2014-05-20) 2 commits
321
+ (merged to 'next' on 2014-06-10 at afd0c29)
322
+ + rebase -i: test "Nothing to do" case with autostash
323
+ + rebase -i: handle "Nothing to do" case with autostash
324
+
325
+ Originally merged to 'next' on 2014-05-21
326
+
327
+
328
+* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
329
+ (merged to 'next' on 2014-06-10 at abae695)
330
+ + pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
331
+
332
+ Originally merged to 'next' on 2014-06-06
333
+
334
+ Avoid unnecessary copy of previous contents when extending the
335
+ hashtable used in pack-objects.
336
+
337
+
338
+* rs/read-ref-at (2014-06-03) 1 commit
339
+ (merged to 'next' on 2014-06-10 at f58f2fc)
340
+ + refs.c: change read_ref_at to use the reflog iterators
341
+
342
+ Originally merged to 'next' on 2014-06-06
343
+
344
+
345
+* sh/enable-preloadindex (2014-06-03) 1 commit
346
+ (merged to 'next' on 2014-06-10 at 7cedf2d)
347
+ + environment.c: enable core.preloadindex by default
348
+
349
+ Originally merged to 'next' on 2014-06-06
350
+
351
+
352
+* sk/test-cmp-bin (2014-06-04) 1 commit
353
+ (merged to 'next' on 2014-06-10 at 020a475)
354
+ + t5000, t5003: do not use test_cmp to compare binary files
355
+
356
+ Originally merged to 'next' on 2014-06-06
357
+
358
+
359
+* sk/wincred (2014-05-14) 2 commits
360
+ (merged to 'next' on 2014-06-10 at 8d03e5a)
361
+ + wincred: avoid overwriting configured variables
362
+ + wincred: add install target
363
+
364
+ Originally merged to 'next' on 2014-05-21
365
+
366
+
367
+* sk/windows-unc-path (2014-06-10) 1 commit
368
+ (merged to 'next' on 2014-06-10 at 3598cc6)
369
+ + Windows: allow using UNC path for git repository
370
+ (this branch is used by sk/mingw-main, sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
371
+
372
+ Originally merged to 'next' on 2014-05-21
373
+
374
+
375
+* ta/string-list-init (2014-06-06) 1 commit
376
+ (merged to 'next' on 2014-06-10 at bf209ff)
377
+ + string-list: spell all values out that are given to a string_list initializer
378
+
379
+ Originally merged to 'next' on 2014-06-06
380
+
381
+--------------------------------------------------
382
+[New Topics]
383
+
384
+* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
385
+ (merged to 'next' on 2014-06-16 at 29734cc)
386
+ + sequencer: signal failed ff as an aborted, not a conflicted merge
387
+
388
+ Will merge to 'master'.
389
+
390
+
391
+* hv/submodule-config (2014-06-13) 6 commits
392
+ - SQUASH compilation fix
393
+ - do not die on error of parsing fetchrecursesubmodules option
394
+ - use new config API for worktree configurations of submodules
395
+ - extract functions for submodule config set and lookup
396
+ - implement submodule config cache for lookup of submodule names
397
+ - hashmap: add enum for hashmap free_entries option
398
+
399
+
400
+* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
401
+ (merged to 'next' on 2014-06-16 at 3c05e19)
402
+ + git-p4: fix submit in non --prepare-p4-only mode
403
+
404
+ Will merge to 'master'.
405
+
406
+
407
+* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
408
+ - Win32: Unicode arguments (incoming)
409
+ - Win32: Unicode arguments (outgoing)
410
+ - MinGW: disable CRT command line globbing
411
+ - Win32: fix potential multi-threading issue
412
+ - Win32: simplify internal mingw_spawn* APIs
413
+ - Win32: let mingw_execve() return an int
414
+ (this branch uses sk/mingw-main and sk/mingw-uni-console.)
415
+
416
+
417
+* sp/complete-ext-alias (2014-06-13) 1 commit
418
+ (merged to 'next' on 2014-06-16 at 399679e)
419
+ + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
420
+
421
+ Will merge to 'master'.
422
+
423
+
424
+* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
425
+ - rebase--merge: fix --skip with two conflicts in a row
426
+
427
+ "git rebase --skip" did not work well when it stopped due to a
428
+ conflict twice in a row.
429
+
430
+ Will merge to 'next'.
431
+
432
+
433
+* jl/submodule-tests (2014-06-16) 16 commits
434
+ - revert: add t3513 for submodule updates
435
+ - stash: add t3906 for submodule updates
436
+ - am: add t4255 for submodule updates
437
+ - cherry-pick: add t3512 for submodule updates
438
+ - pull: add t5572 for submodule updates
439
+ - SQUASH???
440
+ - rebase: add t3426 for submodule updates
441
+ - merge: add t7613 for submodule updates
442
+ - bisect: add t6041 for submodule updates
443
+ - reset: add t7112 for submodule updates
444
+ - read-tree: add t1013 for submodule updates
445
+ - apply: add t4137 for submodule updates
446
+ - checkout: call the new submodule update test framework
447
+ - submodules: Add the lib-submodule-update.sh test library
448
+ - SQUASH???
449
+ - test-lib: add test_dir_is_empty()
450
+
451
+ Expecting a reroll.
452
+
453
+
454
+* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
455
+ - submodule: document "sync --recursive"
456
+
457
+ Will merge to 'next'.
458
+
459
+
460
+* pb/trim-trailing-spaces (2014-06-13) 1 commit
461
+ - t0008: do not depend on 'echo' handling backslashes specially
462
+
463
+ Will merge to 'next'.
464
+
465
+
466
+* po/error-message-style (2014-06-16) 1 commit
467
+ - doc: state coding guideline for error message punctuation
468
+
469
+ Expecting a reroll.
470
+
471
+
472
+* rs/blame-refactor (2014-06-13) 2 commits
473
+ - blame: simplify prepare_lines()
474
+ - blame: factor out get_next_line()
475
+
476
+ Will merge to 'next'.
477
+
478
+
479
+* rs/ref-transaction (2014-06-17) 48 commits
480
+ - refs.c: make write_ref_sha1 static
481
+ - fetch.c: change s_update_ref to use a ref transaction
482
+ - refs.c: propagate any errno==ENOTDIR from _commit back to the callers
483
+ - refs.c: pass a skip list to name_conflict_fn
484
+ - refs.c: call lock_ref_sha1_basic directly from commit
485
+ - refs.c: move the check for valid refname to lock_ref_sha1_basic
486
+ - refs.c: pass NULL as *flags to read_ref_full
487
+ - refs.c: pass the ref log message to _create/delete/update instead of _commit
488
+ - refs.c: make delete_ref use a transaction
489
+ - refs.c: make prune_ref use a transaction to delete the ref
490
+ - refs.c: remove lock_ref_sha1
491
+ - refs.c: remove the update_ref_write function
492
+ - refs.c: remove the update_ref_lock function
493
+ - refs.c: make lock_ref_sha1 static
494
+ - walker.c: use ref transaction for ref updates
495
+ - fast-import.c: use a ref transaction when dumping tags
496
+ - receive-pack.c: use a reference transaction for updating the refs
497
+ - refs.c: change update_ref to use a transaction
498
+ - branch.c: use ref transaction for all ref updates
499
+ - fast-import.c: change update_branch to use ref transactions
500
+ - sequencer.c: use ref transactions for all ref updates
501
+ - commit.c: use ref transactions for updates
502
+ - replace.c: use the ref transaction functions for updates
503
+ - tag.c: use ref transactions when doing updates
504
+ - refs.c: add transaction.status and track OPEN/CLOSED/ERROR
505
+ - refs.c: make ref_transaction_begin take an err argument
506
+ - refs.c: update ref_transaction_delete to check for error and return status
507
+ - refs.c: change ref_transaction_create to do error checking and return status
508
+ - refs.c: change ref_transaction_update() to do error checking and return status
509
+ - refs.c: remove the onerr argument to ref_transaction_commit
510
+ - update-ref: use err argument to get error from ref_transaction_commit
511
+ - refs.c: make update_ref_write update a strbuf on failure
512
+ - refs.c: add an err argument to delete_ref_loose
513
+ - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
514
+ - refs.c: log_ref_write should try to return meaningful errno
515
+ - refs.c: make resolve_ref_unsafe set errno to something meaningful on error
516
+ - refs.c: commit_packed_refs to return a meaningful errno on failure
517
+ - refs.c: make remove_empty_directories alwasy set errno to something sane
518
+ - refs.c: verify_lock should set errno to something meaningful
519
+ - refs.c: make sure log_ref_setup returns a meaningful errno
520
+ - refs.c: add an err argument to repack_without_refs
521
+ - lockfile.c: make lock_file return a meaningful errno on failurei
522
+ - lockfile.c: add a new public function unable_to_lock_message
523
+ - refs.c: add a strbuf argument to ref_transaction_commit for error logging
524
+ - refs.c: allow passing NULL to ref_transaction_free
525
+ - refs.c: constify the sha arguments for ref_transaction_create|delete|update
526
+ - refs.c: ref_transaction_commit should not free the transaction
527
+ - refs.c: remove ref_transaction_rollback
528
+
529
+
530
+* ye/doc-http-proto (2014-06-16) 1 commit
531
+ - http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
532
+
533
+ Will merge to 'next'.
534
+
535
+
536
+* jk/pretty-G-format-fixes (2014-06-17) 5 commits
537
+ - pretty: avoid reading past end-of-string with "%G"
538
+ - t7510: check %G* pretty-format output
539
+ - t7510: test a commit signed by an unknown key
540
+ - t7510: use consistent &&-chains in loop
541
+ - t7510: stop referring to master in later tests
542
+
543
+
544
+* tb/unicode-7.0 (2014-06-17) 1 commit
545
+ - Update of unicode_width.h to Unicode Version 7.0
546
+
547
+--------------------------------------------------
548
+[Stalled]
549
+
550
+* cc/replace-graft (2014-06-09) 5 commits
551
+ - DONTMERGE: wise to wait for peff's commit->buffer length series
552
+ - contrib: add convert-grafts-to-replace-refs.sh
553
+ - Documentation: replace: add --graft option
554
+ - replace: add test for --graft
555
+ - replace: add --graft option
556
+
557
+ "git replace" learned a "--graft" option to rewrite parents of a
558
+ commit.
559
560
561
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
@@ -516,17 +807,6 @@ of the repositories listed at
807
Waiting for a reroll.
808
809
519
-* jl/submodule-recursive-checkout (2013-12-26) 5 commits
520
- - Teach checkout to recursively checkout submodules
521
- - submodule: teach unpack_trees() to update submodules
522
- - submodule: teach unpack_trees() to repopulate submodules
523
- - submodule: teach unpack_trees() to remove submodule contents
524
- - submodule: prepare for recursive checkout of submodules
525
-
526
- An RFCv2 exists ($gmane/241455) with sizable review comments.
527
- Expecting a reroll.
528
-
529
-
810
* jc/graph-post-root-gap (2013-12-30) 3 commits
811
- WIP: document what we want at the end
812
- graph: remove unused code a bit
@@ -560,438 +840,248 @@ of the repositories listed at
840
841
842
* jc/show-branch (2014-03-24) 5 commits
563
- - show-branch: use commit slab to represent bitflags of arbitrary width
564
- - show-branch.c: remove "all_mask"
565
- - show-branch.c: abstract out "flags" operation
566
- - show-branch.c: lift all_mask/all_revs to a global static
567
- - show-branch.c: update comment style
568
-
569
- Waiting for the final step to lift the hard-limit before sending it out.
570
-
571
---------------------------------------------------
572
-[Cooking]
573
-
574
-* sk/test-cmp-bin (2014-06-04) 1 commit
575
- (merged to 'next' on 2014-06-10 at 020a475)
576
- + t5000, t5003: do not use test_cmp to compare binary files
577
-
578
- Originally merged to 'next' on 2014-06-06
579
-
580
- Will merge to 'master'.
581
-
582
-
583
-* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
584
- (merged to 'next' on 2014-06-10 at 4560669)
585
- + refs.c: optimize check_refname_component()
586
- (this branch is used by dt/refs-check-refname-component-sse42.)
587
-
588
- Originally merged to 'next' on 2014-06-06
589
-
590
- Will merge to 'master'.
591
-
592
-
593
-* jm/dedup-test-config (2014-06-05) 1 commit
594
- (merged to 'next' on 2014-06-10 at 8966f54)
595
- + t/t7810-grep.sh: remove duplicate test_config()
596
-
597
- Originally merged to 'next' on 2014-06-06
598
-
599
- Will merge to 'master'.
600
-
601
-
602
-* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
603
- (merged to 'next' on 2014-06-10 at fc63847)
604
- + commit -m: commit staged submodules regardless of ignore config
605
- + status/commit: show staged submodules regardless of ignore config
606
-
607
- Originally merged to 'next' on 2014-06-06
608
-
609
- submodule.*.ignore and diff.ignoresubmodules are used to ignore all
610
- submodule changes in "diff" output, but it can be confusing to
611
- apply these configuration values to status and commit.
612
-
613
- This is a backward-incompatible change, but should be so in a good
614
- way (aka bugfix).
615
-
616
- Will merge to 'master'.
617
-
618
-
619
-* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
620
- - git-gui: show staged submodules regardless of ignore config
621
-
622
- Tentatively queued what I expect to receive via Pat Thoyts.
623
-
624
-
625
-* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
626
- - gitk: show staged submodules regardless of ignore config
627
- - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
628
- - l10n: Init Vietnamese translation
629
-
630
- Tentatively queued what I expect to receive via Paul Mackerras.
631
-
632
-
633
-* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
634
- (merged to 'next' on 2014-06-10 at eddb5bc)
635
- + transport-helper.c: rearrange xcalloc arguments
636
- + remote.c: rearrange xcalloc arguments
637
- + reflog-walk.c: rearrange xcalloc arguments
638
- + pack-revindex.c: rearrange xcalloc arguments
639
- + notes.c: rearrange xcalloc arguments
640
- + imap-send.c: rearrange xcalloc arguments
641
- + http-push.c: rearrange xcalloc arguments
642
- + diff.c: rearrange xcalloc arguments
643
- + config.c: rearrange xcalloc arguments
644
- + commit.c: rearrange xcalloc arguments
645
- + builtin/remote.c: rearrange xcalloc arguments
646
- + builtin/ls-remote.c: rearrange xcalloc arguments
647
-
648
- Originally merged to 'next' on 2014-06-06
649
-
650
- Like calloc(3), xcalloc() takes nmemb and then size.
651
-
652
- Will merge to 'master'.
653
-
654
-
655
-* jk/complete-merge-pull (2014-05-27) 2 commits
656
- (merged to 'next' on 2014-06-10 at d1524c5)
657
- + completion: add missing options for git-merge
658
- + completion: add a note that merge options are shared
659
-
660
- Originally merged to 'next' on 2014-06-06
661
-
662
- The completion code did not know about quite a few options that are
663
- common between "git merge" and "git pull", and a couple of options
664
- unique to "git merge".
665
-
666
- Will merge to 'master'.
667
-
668
-
669
-* jl/remote-rm-prune (2014-05-27) 3 commits
670
- (merged to 'next' on 2014-06-10 at 13259ff)
671
- + remote prune: optimize "dangling symref" check/warning
672
- + remote: repack packed-refs once when deleting multiple refs
673
- + remote rm: delete remote configuration as the last
674
-
675
- Originally merged to 'next' on 2014-06-06
676
-
677
- "git remote rm" and "git remote prune" can involve removing many
678
- refs at once, which is not a very efficient thing to do when very
679
- many refs exist in the packed-refs file.
680
-
681
- Will merge to 'master'.
682
-
683
-
684
-* jm/instaweb-apache-24 (2014-05-27) 1 commit
685
- (merged to 'next' on 2014-06-10 at ecf2048)
686
- + git-instaweb: add support for Apache 2.4
687
-
688
- Originally merged to 'next' on 2014-06-06
689
-
690
- Will merge to 'master'.
691
-
692
-
693
-* jm/t9138-style-fix (2014-05-27) 1 commit
694
- (merged to 'next' on 2014-06-10 at 034f13d)
695
- + t9138-git-svn-authors-prog.sh fixups
696
-
697
- Originally merged to 'next' on 2014-06-06
698
-
699
- Will merge to 'master'.
700
-
701
-
702
-* nd/daemonize-gc (2014-05-27) 1 commit
703
- (merged to 'next' on 2014-06-10 at 6fae7b0)
704
- + gc --auto: do not lock refs in the background
705
-
706
- Originally merged to 'next' on 2014-06-06
707
-
708
- "git gc --auto" was recently changed to run in the background to
709
- give control back early to the end-user sitting in front of the
710
- terminal, but it forgot that housekeeping involving reflogs should
711
- be done without other processes competing for accesses to the refs.
712
-
713
- Will merge to 'master'.
714
-
715
-
716
-* ow/config-mailmap-pathname (2014-05-27) 1 commit
717
- (merged to 'next' on 2014-06-10 at aba4ca2)
718
- + config: respect '~' and '~user' in mailmap.file
719
-
720
- Originally merged to 'next' on 2014-06-06
721
-
722
- mailmap.file configuration names a pathname, hence should honor
723
- ~/path and ~user/path as its value.
724
-
725
- Will merge to 'master'.
726
-
727
-
728
-* jm/doc-wording-tweaks (2014-05-28) 1 commit
729
- (merged to 'next' on 2014-06-10 at 5f2e094)
730
- + Documentation: wording fixes in the user manual and glossary
731
-
732
- Originally merged to 'next' on 2014-06-06
733
-
734
- Will merge to 'master'.
735
-
736
-
737
-* jc/fetch-push-refmap (2014-06-05) 9 commits
738
- (merged to 'next' on 2014-06-10 at 13c13ae)
739
- + fetch: allow explicit --refmap to override configuration
740
- + fetch doc: add a section on configured remote-tracking branches
741
- + fetch doc: remove "short-cut" section
742
- + fetch doc: update refspec format description
743
- + fetch doc: on pulling multiple refspecs
744
- + fetch doc: remove notes on outdated "mixed layout"
745
- + fetch doc: update note on '+' in front of the refspec
746
- + fetch doc: move FETCH_HEAD material lower and add an example
747
- + fetch doc: update introductory part for clarity
748
-
749
- Will merge to 'master'.
750
-
751
-
752
-* lt/log-auto-decorate (2014-05-30) 1 commit
753
- (merged to 'next' on 2014-06-10 at f149f4a)
754
- + git log: support "auto" decorations
755
-
756
- Originally merged to 'next' on 2014-06-06
757
-
758
- Will merge to 'master'.
759
-
760
-
761
-* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
762
- (merged to 'next' on 2014-06-10 at abae695)
763
- + pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
764
-
765
- Originally merged to 'next' on 2014-06-06
766
-
767
- Avoid unnecessary copy of previous contents when extending the
768
- hashtable used in pack-objects.
769
-
770
- Will merge to 'master'.
771
-
772
-
773
-* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
774
- (merged to 'next' on 2014-06-10 at 713ebe0)
775
- + error_resolve_conflict: drop quotations around operation
776
- + error_resolve_conflict: rewrap advice message
777
-
778
- Originally merged to 'next' on 2014-06-06
779
-
780
- Will merge to 'master'.
781
-
782
-
783
-* rs/read-ref-at (2014-06-03) 1 commit
784
- (merged to 'next' on 2014-06-10 at f58f2fc)
785
- + refs.c: change read_ref_at to use the reflog iterators
786
-
787
- Originally merged to 'next' on 2014-06-06
788
-
789
- Will merge to 'master'.
790
-
791
-
792
-* sh/enable-preloadindex (2014-06-03) 1 commit
793
- (merged to 'next' on 2014-06-10 at 7cedf2d)
794
- + environment.c: enable core.preloadindex by default
795
-
796
- Originally merged to 'next' on 2014-06-06
797
-
798
- Will merge to 'master'.
799
-
800
-
801
-* ta/string-list-init (2014-06-06) 1 commit
802
- (merged to 'next' on 2014-06-10 at bf209ff)
803
- + string-list: spell all values out that are given to a string_list initializer
804
-
805
- Originally merged to 'next' on 2014-06-06
806
-
807
- Will merge to 'master'.
808
-
809
-
810
-* jk/daemon-tolower (2014-05-23) 1 commit
811
- (merged to 'next' on 2014-06-10 at f3c549d)
812
- + daemon/config: factor out duplicate xstrdup_tolower
813
-
814
- Originally merged to 'next' on 2014-05-23
815
-
816
- Will merge to 'master'.
817
-
818
-
819
-* jk/strbuf-tolower (2014-05-23) 1 commit
820
- (merged to 'next' on 2014-06-10 at 01e6983)
821
- + strbuf: add strbuf_tolower function
822
-
823
- Originally merged to 'next' on 2014-05-23
824
-
825
- Will merge to 'master'.
826
-
827
-
828
-* jk/http-errors (2014-05-27) 8 commits
829
- (merged to 'next' on 2014-06-10 at 30e9212)
830
- + http: default text charset to iso-8859-1
831
- + remote-curl: reencode http error messages
832
- + strbuf: add strbuf_reencode helper
833
- + http: optionally extract charset parameter from content-type
834
- + http: extract type/subtype portion of content-type
835
- + t5550: test display of remote http error messages
836
- + t/lib-httpd: use write_script to copy CGI scripts
837
- + test-lib: preserve GIT_CURL_VERBOSE from the environment
838
-
839
- Originally merged to 'next' on 2014-06-06
840
-
841
- Propagate the error messages from the webserver better to the
842
- client coming over the HTTP transport.
843
-
844
- Will merge to 'master'.
843
+ - show-branch: use commit slab to represent bitflags of arbitrary width
844
+ - show-branch.c: remove "all_mask"
845
+ - show-branch.c: abstract out "flags" operation
846
+ - show-branch.c: lift all_mask/all_revs to a global static
847
+ - show-branch.c: update comment style
848
849
+ Waiting for the final step to lift the hard-limit before sending it out.
850
847
-* jm/format-patch-mail-sig (2014-05-27) 2 commits
848
- (merged to 'next' on 2014-06-10 at 310f59e)
849
- + format-patch: add "--signature-file=<file>" option
850
- + format-patch: make newline after signature conditional
851
+--------------------------------------------------
852
+[Cooking]
853
852
- Originally merged to 'next' on 2014-06-06
854
+* jc/fetch-pull-refmap (2014-06-12) 10 commits
855
+ (merged to 'next' on 2014-06-12 at 5428530)
856
+ + docs: Explain the purpose of fetch's and pull's <refspec> parameter.
857
+ (merged to 'next' on 2014-06-10 at 13c13ae)
858
+ + fetch: allow explicit --refmap to override configuration
859
+ + fetch doc: add a section on configured remote-tracking branches
860
+ + fetch doc: remove "short-cut" section
861
+ + fetch doc: update refspec format description
862
+ + fetch doc: on pulling multiple refspecs
863
+ + fetch doc: remove notes on outdated "mixed layout"
864
+ + fetch doc: update note on '+' in front of the refspec
865
+ + fetch doc: move FETCH_HEAD material lower and add an example
866
+ + fetch doc: update introductory part for clarity
867
868
Will merge to 'master'.
869
870
857
-* sk/wincred (2014-05-14) 2 commits
858
- (merged to 'next' on 2014-06-10 at 8d03e5a)
859
- + wincred: avoid overwriting configured variables
860
- + wincred: add install target
871
+* nd/split-index (2014-06-13) 32 commits
872
+ - t1700: new tests for split-index mode
873
+ - t2104: make sure split index mode is off for the version test
874
+ - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
875
+ - read-tree: note about dropping split-index mode or index version
876
+ - read-tree: force split-index mode off on --index-output
877
+ - rev-parse: add --shared-index-path to get shared index path
878
+ - update-index --split-index: do not split if $GIT_DIR is read only
879
+ - update-index: new options to enable/disable split index mode
880
+ - split-index: strip pathname of on-disk replaced entries
881
+ - split-index: do not invalidate cache-tree at read time
882
+ - split-index: the reading part
883
+ - split-index: the writing part
884
+ - read-cache: mark updated entries for split index
885
+ - read-cache: save deleted entries in split index
886
+ - read-cache: mark new entries for split index
887
+ - read-cache: split-index mode
888
+ - read-cache: save index SHA-1 after reading
889
+ - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
890
+ - cache-tree: mark istate->cache_changed on prime_cache_tree()
891
+ - cache-tree: mark istate->cache_changed on cache tree update
892
+ - cache-tree: mark istate->cache_changed on cache tree invalidation
893
+ - unpack-trees: be specific what part of the index has changed
894
+ - resolve-undo: be specific what part of the index has changed
895
+ - update-index: be specific what part of the index has changed
896
+ - read-cache: be specific what part of the index has changed
897
+ - read-cache: be strict about "changed" in remove_marked_cache_entries()
898
+ - read-cache: store in-memory flags in the first 12 bits of ce_flags
899
+ - read-cache: relocate and unexport commit_locked_index()
900
+ - read-cache: new API write_locked_index instead of write_index/write_cache
901
+ - sequencer: do not update/refresh index if the lock cannot be held
902
+ - ewah: delete unused ewah_read_mmap_native declaration
903
+ - ewah: fix constness of ewah_read_mmap
904
862
- Originally merged to 'next' on 2014-05-21
905
864
- Will merge to 'master'.
906
+* ep/avoid-test-a-o (2014-06-10) 21 commits
907
+ - git-submodule.sh: avoid "echo" path-like values
908
+ - SQUASH: misconversion breakage fix
909
+ - git-submodule.sh: avoid "test <cond> -a/-o <cond>"
910
+ - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
911
+ - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
912
+ - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
913
+ - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
914
+ - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
915
+ - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
916
+ - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
917
+ - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
918
+ - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
919
+ - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
920
+ - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
921
+ - git-bisect.sh: avoid "test <cond> -a/-o <cond>"
922
+ - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
923
+ - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
924
+ - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
925
+ - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
926
+ - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
927
+ - check_bindir: avoid "test <cond> -a/-o <cond>"
928
929
867
-* as/pretty-truncate (2014-05-21) 5 commits
868
- (merged to 'next' on 2014-06-10 at d8147a2)
869
- + pretty.c: format string with truncate respects logOutputEncoding
870
- + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
871
- + t4205 (log-pretty-format): use `tformat` rather than `format`
872
- + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
873
- + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
930
+* jc/revision-dash-count-parsing (2014-06-09) 1 commit
931
+ (merged to 'next' on 2014-06-10 at 1aeca19)
932
+ + revision: parse "git log -<count>" more carefully
933
875
- Originally merged to 'next' on 2014-05-23
934
+ "git log -2master" is a common typo that shows two commits starting
935
+ from whichever random branch that is not 'master' that happens to
936
+ be checked out currently.
937
938
Will merge to 'master'.
939
940
880
-* cc/replace-graft (2014-06-09) 5 commits
881
- - DONTMERGE: wise to wait for peff's commit->buffer length series
882
- - contrib: add convert-grafts-to-replace-refs.sh
883
- - Documentation: replace: add --graft option
884
- - replace: add test for --graft
885
- - replace: add --graft option
886
- (this branch uses cc/replace-edit.)
941
+* jc/test-lazy-prereq (2014-06-13) 7 commits
942
+ - tests: drop GIT_*_TIMING_TESTS environment variable support
943
+ (merged to 'next' on 2014-06-10 at 4f774f7)
944
+ + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
945
+ + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
946
+ + t3302: do not chdir around in the primary test process
947
+ + t3302: coding style updates
948
+ + test: turn USR_BIN_TIME into a lazy prerequisite
949
+ + test: turn EXPENSIVE into a lazy prerequisite
950
888
- "git replace" learned a "--graft" option to rewrite parents of a
889
- commit.
951
+ Test-script clean-up. The last step might be controversial.
952
953
+ Will merge to 'master' except for the last one.
954
892
-* jk/argv-array-for-child-process (2014-05-15) 7 commits
893
- (merged to 'next' on 2014-06-10 at 07a167b)
894
- + argv-array: drop "detach" code
895
- + get_importer: use run-command's internal argv_array
896
- + get_exporter: use argv_array
897
- + get_helper: use run-command's internal argv_array
898
- + git_connect: use argv_array
899
- + run_column_filter: use argv_array
900
- + run-command: store an optional argv_array
955
902
- Originally merged to 'next' on 2014-05-21
956
+* jk/commit-buffer-length (2014-06-13) 18 commits
957
+ (merged to 'next' on 2014-06-16 at b2d2d7b)
958
+ + reuse cached commit buffer when parsing signatures
959
+ + commit: record buffer length in cache
960
+ + commit: convert commit->buffer to a slab
961
+ + commit-slab: provide a static initializer
962
+ + use get_commit_buffer everywhere
963
+ + convert logmsg_reencode to get_commit_buffer
964
+ + use get_commit_buffer to avoid duplicate code
965
+ + use get_cached_commit_buffer where appropriate
966
+ + provide helpers to access the commit buffer
967
+ + provide a helper to set the commit buffer
968
+ + provide a helper to free commit buffer
969
+ + sequencer: use logmsg_reencode in get_message
970
+ + logmsg_reencode: return const buffer
971
+ + do not create "struct commit" with xcalloc
972
+ + commit: push commit_index update into alloc_commit_node
973
+ + alloc: include any-object allocations in alloc_report
974
+ + replace dangerous uses of strbuf_attach
975
+ + commit_tree: take a pointer/len pair rather than a const strbuf
976
+
977
+ Move "commit->buffer" out of the in-core commit object and keep
978
+ track of their lengths. Use this to optimize the code paths to
979
+ validate GPG signatures in commit objects.
980
981
Will merge to 'master'.
982
983
907
-* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
908
- (merged to 'next' on 2014-06-10 at 984862b)
909
- + run_diff_files: do not look at uninitialized stat data
910
-
911
- Originally merged to 'next' on 2014-05-21
984
+* jm/api-strbuf-doc (2014-06-09) 1 commit
985
+ (merged to 'next' on 2014-06-10 at 831aa30)
986
+ + api-strbuf.txt minor typos
987
988
Will merge to 'master'.
989
990
916
-* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
917
- (merged to 'next' on 2014-06-10 at 299ea28)
918
- + open_sha1_file: report "most interesting" errno
919
-
920
- Originally merged to 'next' on 2014-05-21
991
+* rs/more-starts-with (2014-06-09) 1 commit
992
+ (merged to 'next' on 2014-06-10 at efcd02e)
993
+ + Use starts_with() for C strings instead of memcmp()
994
995
Will merge to 'master'.
996
997
925
-* rr/rebase-autostash-fix (2014-05-20) 2 commits
926
- (merged to 'next' on 2014-06-10 at afd0c29)
927
- + rebase -i: test "Nothing to do" case with autostash
928
- + rebase -i: handle "Nothing to do" case with autostash
998
+* sk/mingw-dirent (2014-06-09) 5 commits
999
+ - Win32 dirent: improve dirent implementation
1000
+ - Win32 dirent: clarify #include directives
1001
+ - Win32 dirent: change FILENAME_MAX to MAX_PATH
1002
+ - Win32 dirent: remove unused dirent.d_reclen member
1003
+ - Win32 dirent: remove unused dirent.d_ino member
1004
930
- Originally merged to 'next' on 2014-05-21
1005
932
- Will merge to 'master'.
1006
+* sk/mingw-main (2014-06-10) 2 commits
1007
+ - mingw: avoid const warning
1008
+ - Win32: move main macro to a function
1009
+ (this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
1010
1011
935
-* sk/windows-unc-path (2014-06-10) 1 commit
936
- (merged to 'next' on 2014-06-10 at 3598cc6)
937
- + Windows: allow using UNC path for git repository
938
- (this branch is used by sk/mingw-main and sk/mingw-uni-console.)
1012
+* sk/mingw-uni-console (2014-06-16) 7 commits
1013
+ - Win32: reliably detect console pipe handles
1014
+ - Win32: fix broken pipe detection
1015
+ - Win32: Thread-safe windows console output
1016
+ - Win32: add Unicode conversion functions
1017
+ - Win32: warn if the console font doesn't support Unicode
1018
+ - Win32: detect console streams more reliably
1019
+ - Win32: support Unicode console output
1020
+ (this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
1021
940
- Originally merged to 'next' on 2014-05-21
1022
+ Now, are Windows folks happy with all four mingw topics?
1023
+
1024
+
1025
+* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
1026
+ (merged to 'next' on 2014-06-10 at 374082c)
1027
+ + t5551: fix the 50,000 tag test
1028
1029
Will merge to 'master'.
1030
1031
945
-* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
946
- (merged to 'next' on 2014-06-10 at 0cd28d7)
947
- + move "--follow needs one pathspec" rule to diff_setup_done
1032
+* jk/repack-pack-keep-objects (2014-06-10) 3 commits
1033
+ (merged to 'next' on 2014-06-16 at 89716c9)
1034
+ + repack: s/write_bitmap/&s/ in code
1035
+ + repack: respect pack.writebitmaps
1036
+ + repack: do not accidentally pack kept objects by default
1037
+ (this branch is used by jk/repack-pack-writebitmaps-config.)
1038
949
- Originally merged to 'next' on 2014-05-23
1039
+ Recent updates to "git repack" started to duplicate objects that
1040
+ are in packfiles marked with .keep flag into the new packfile by
1041
+ mistake.
1042
1043
Will merge to 'master'.
1044
1045
954
-* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
955
- (merged to 'next' on 2014-06-10 at 745b05c)
956
- + t/lib-httpd: require SANITY prereq
957
-
958
- Originally merged to 'next' on 2014-05-21
1046
+* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
1047
+ (merged to 'next' on 2014-06-16 at 777005d)
1048
+ + t7700: drop explicit --no-pack-kept-objects from .keep test
1049
+ + repack: introduce repack.writeBitmaps config option
1050
+ + repack: simplify handling of --write-bitmap-index
1051
+ + pack-objects: stop respecting pack.writebitmaps
1052
+ (this branch uses jk/repack-pack-keep-objects.)
1053
1054
Will merge to 'master'.
1055
1056
963
-* cb/byte-order (2014-05-30) 3 commits
964
- (merged to 'next' on 2014-06-10 at 63db8ee)
965
- + compat/bswap.h: fix endianness detection
966
- + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
967
- + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
1057
+* mg/verify-commit (2014-06-10) 3 commits
1058
+ - verify-commit: scriptable commit signature verification
1059
+ - gpg-interface: provide access to the payload
1060
+ - pretty: free the gpg status buf
1061
969
- Originally merged to 'next' on 2014-05-30
1062
+ What is queued here is v1; v2 exists but I skipped it.
1063
+ Expecting a reroll.
1064
971
- Compatibility enhancement for Solaris.
1065
+
1066
+* nd/init-restore-env (2014-06-10) 1 commit
1067
+ (merged to 'next' on 2014-06-16 at ecbbfca)
1068
+ + git potty: restore environments after alias expansion
1069
1070
Will merge to 'master'.
1071
1072
976
-* cc/replace-edit (2014-05-19) 10 commits
977
- (merged to 'next' on 2014-06-10 at ff69722)
978
- + Documentation: replace: describe new --edit option
979
- + replace: add --edit to usage string
980
- + replace: add tests for --edit
981
- + replace: die early if replace ref already exists
982
- + replace: refactor checking ref validity
983
- + replace: make sure --edit results in a different object
984
- + replace: add --edit option
985
- + replace: factor object resolution out of replace_object
986
- + replace: use OPT_CMDMODE to handle modes
987
- + replace: refactor command-mode determination
988
- (this branch is used by cc/replace-graft.)
1073
+* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
1074
+ - git-gui: show staged submodules regardless of ignore config
1075
990
- Originally merged to 'next' on 2014-05-19
1076
+ Tentatively queued what I expect to receive via Pat Thoyts.
1077
992
- "git replace" learns a new "--edit" option.
1078
994
- Will merge to 'master'.
1079
+* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
1080
+ - gitk: show staged submodules regardless of ignore config
1081
+ - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
1082
+ - l10n: Init Vietnamese translation
1083
+
1084
+ Will drop, as I heard from Paul that these are queued in his tree.
1085
1086
1087
* mt/send-email-cover-to-cc (2014-06-10) 3 commits
@@ -1005,49 +1095,17 @@ of the repositories listed at
1095
Will merge to 'master'.
1096
1097
1008
-* ib/test-selectively-run (2014-06-06) 4 commits
1009
- (merged to 'next' on 2014-06-10 at 1235570)
1010
- + t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
1011
- + test-lib: '--run' to run only specific tests
1012
- + test-lib: tests skipped by GIT_SKIP_TESTS say so
1013
- + test-lib: document short options in t/README
1014
-
1015
- Originally merged to 'next' on 2014-06-06
1016
-
1017
- Allow specifying only certain individual test pieces to be run
1018
- using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
1019
-
1020
- Will merge to 'master'.
1021
-
1022
-
1023
-* fc/remote-helper-refmap (2014-04-21) 8 commits
1024
- (merged to 'next' on 2014-06-10 at 8cd8cf8)
1025
- + transport-helper: remove unnecessary strbuf resets
1026
- + transport-helper: add support to delete branches
1027
- + fast-export: add support to delete refs
1028
- + fast-import: add support to delete refs
1029
- + transport-helper: add support to push symbolic refs
1030
- + transport-helper: add support for old:new refspec
1031
- + fast-export: add new --refspec option
1032
- + fast-export: improve argument parsing
1033
-
1034
- Originally merged to 'next' on 2014-04-22
1035
-
1036
- Allow remote-helper/fast-import based transport to rename the refs
1037
- while transferring the history.
1038
-
1039
-
1040
-* mt/patch-id-stable (2014-06-10) 5 commits
1098
+* mt/patch-id-stable (2014-06-10) 1 commit
1099
- patch-id: change default to stable
1042
- (merged to 'next' on 2014-06-10 at b75e70f)
1043
- + patch-id-test: test stable and unstable behaviour
1044
- + patch-id: make it stable against hunk reordering
1045
- + test doc: test_write_lines does not split its arguments
1046
- + test: add test_write_lines helper
1100
1048
- Originally merged to 'next' on 2014-05-07
1101
+--------------------------------------------------
1102
+[Discarded]
1103
1050
- Introduce a new way to compute patch-id for a patch that is not
1051
- affected by the order of the paths that appear in the input.
1104
+* jl/submodule-recursive-checkout (2013-12-26) 5 commits
1105
+ . Teach checkout to recursively checkout submodules
1106
+ . submodule: teach unpack_trees() to update submodules
1107
+ . submodule: teach unpack_trees() to repopulate submodules
1108
+ . submodule: teach unpack_trees() to remove submodule contents
1109
+ . submodule: prepare for recursive checkout of submodules
1110
1053
- Will merge to 'master' except for the last one.
1111
+ Dropped for now to make room for another topic ($gmane/251521)