What's cooking (2014/06 #01)
Junio C Hamano committed
Jun 3, 2014 at 12:55 UTC
56c229d1822ab9bd121a22a9a89ac497e514ff99
1 file changed
+739
-613
whats-cooking.txt
+739
-613
@@ -1,83 +1,580 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2014, #05; Fri, 23)
4
-X-master-at: 4a28f169ad29ba452e0e7bea2583914c10c58322
5
-X-next-at: daf83cafd8ed3cb640a2047d5069cdbf9d18e7c0
3
+Subject: What's cooking in git.git (Jun 2014, #01; Tue, 3)
4
+X-master-at: 79dcccc503ac228630ecf15dcf8e1d9455daef2d
5
+X-next-at: cc83a7f2654514ddbeb91a63300d3b726f6df536
6
7
-What's cooking in git.git (May 2014, #05; Fri, 23)
7
+What's cooking in git.git (Jun 2014, #01; Tue, 3)
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 the 'master' branch has past v2.0.0-rc4 (which was
15
-unplanned, but there were last minute regressions to be taken care
16
-of). Hopefully we can tag v2.0.0 final early next week.
14
+The first batch of topics, all of which have been cooking for quite
15
+a while on the 'next' branch, have been merged to 'master'. I'll
16
+
17
+ - merge another batch to 'master', then
18
+ - rewind the tip of 'next' in preparation to start accepting new topics
19
+
20
+sometime mid-next week. I'll also update tinyurl.com/gitCal for this
21
+cycle soonish.
22
23
You can find the changes described here in the integration branches
24
of the repositories listed at
25
26
http://git-blame.blogspot.com/p/git-public-repositories.html
27
28
+--------------------------------------------------
29
+[Graduated to "master"]
30
+
31
+* as/grep-fullname-config (2014-03-20) 1 commit
32
+ (merged to 'next' on 2014-03-28 at 810a076)
33
+ + grep: add grep.fullName config variable
34
+
35
+ Add a configuration variable to force --full-name to be default for
36
+ "git grep".
37
+
38
+ This may cause regressions on scripted users that do not expect
39
+ this new behaviour.
40
+
41
+
42
+* bg/strbuf-trim (2014-05-06) 2 commits
43
+ (merged to 'next' on 2014-05-07 at 978f378)
44
+ + api-strbuf.txt: add docs for _trim and _ltrim
45
+ + strbuf: use _rtrim and _ltrim in strbuf_trim
46
+
47
+
48
+* dt/api-doc-setup-gently (2014-04-30) 1 commit
49
+ (merged to 'next' on 2014-05-07 at 6054b08)
50
+ + docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
51
+
52
+
53
+* ef/send-email-absolute-path-to-the-command (2014-04-23) 2 commits
54
+ (merged to 'next' on 2014-04-23 at a657e5e)
55
+ + send-email: windows drive prefix (e.g. C:) appears only at the beginning
56
+ (merged to 'next' on 2014-04-21 at 43bebb5)
57
+ + send-email: recognize absolute path on Windows
58
+
59
+
60
+* ep/shell-command-substitution (2014-04-30) 41 commits
61
+ (merged to 'next' on 2014-05-07 at e9952c7)
62
+ + t5000-tar-tree.sh: use the $( ... ) construct for command substitution
63
+ + t4204-patch-id.sh: use the $( ... ) construct for command substitution
64
+ + t4119-apply-config.sh: use the $( ... ) construct for command substitution
65
+ + t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
66
+ + t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
67
+ + t4038-diff-combined.sh: use the $( ... ) construct for command substitution
68
+ + t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
69
+ + t4014-format-patch.sh: use the $( ... ) construct for command substitution
70
+ + t4013-diff-various.sh: use the $( ... ) construct for command substitution
71
+ + t4012-diff-binary.sh: use the $( ... ) construct for command substitution
72
+ + t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
73
+ + t4006-diff-mode.sh: use the $( ... ) construct for command substitution
74
+ + t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
75
+ + t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
76
+ + t1050-large.sh: use the $( ... ) construct for command substitution
77
+ + t1020-subdirectory.sh: use the $( ... ) construct for command substitution
78
+ + t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
79
+ + t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
80
+ + t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
81
+ + t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
82
+ + t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
83
+ + t0300-credentials.sh: use the $( ... ) construct for command substitution
84
+ + t0030-stripspace.sh: use the $( ... ) construct for command substitution
85
+ + t0026-eol-config.sh: use the $( ... ) construct for command substitution
86
+ + t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
87
+ + t0020-crlf.sh: use the $( ... ) construct for command substitution
88
+ + t0010-racy-git.sh: use the $( ... ) construct for command substitution
89
+ + t0001-init.sh: use the $( ... ) construct for command substitution
90
+ + p5302-pack-index.sh: use the $( ... ) construct for command substitution
91
+ + lib-gpg.sh: use the $( ... ) construct for command substitution
92
+ + lib-cvs.sh: use the $( ... ) construct for command substitution
93
+ + lib-credential.sh: use the $( ... ) construct for command substitution
94
+ + git-web--browse.sh: use the $( ... ) construct for command substitution
95
+ + git-stash.sh: use the $( ... ) construct for command substitution
96
+ + git-rebase.sh: use the $( ... ) construct for command substitution
97
+ + git-rebase--merge.sh: use the $( ... ) construct for command substitution
98
+ + git-pull.sh: use the $( ... ) construct for command substitution
99
+ + appp.sh: use the $( ... ) construct for command substitution
100
+ + t7900-subtree.sh: use the $( ... ) construct for command substitution
101
+ + test-gitmw-lib.sh: use the $( ... ) construct for command substitution
102
+ + t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
103
+
104
+ Adjust shell scripts to use $(cmd) instead of `cmd`.
105
+
106
+
107
+* ew/config-protect-mode (2014-05-06) 1 commit
108
+ (merged to 'next' on 2014-05-07 at 8443093)
109
+ + config: preserve config file permissions on edits
110
+
111
+
112
+* fc/merge-default-to-upstream (2014-04-22) 1 commit
113
+ (merged to 'next' on 2014-04-22 at 4f98483)
114
+ + merge: enable defaulttoupstream by default
115
+
116
+ "git merge" without argument, even when there is an upstream
117
+ defined for the current branch, refused to run until
118
+ merge.defaultToUpstream is set to true. Flip the default of that
119
+ configuration variable to true.
120
+
121
+
122
+* fc/mergetool-prompt (2014-04-24) 2 commits
123
+ (merged to 'next' on 2014-05-02 at a554691)
124
+ + mergetool: document the default for --[no-]prompt
125
+ (merged to 'next' on 2014-04-22 at dcaec94)
126
+ + mergetool: run prompt only if guessed tool
127
+
128
+ mergetool.prompt used to default to 'true', always causing a confirmation
129
+ "do you really want to run the tool on this path" to be shown.
130
+
131
+ Among the two purposes the prompt serves, ignore the use case to
132
+ confirm that the user wants to view particular path with the named
133
+ tool, and make the prompt only to confirm the choice of the tool
134
+ made by autodetection and defaulting. For those who configured the
135
+ tool explicitly, the prompt shown for the latter purpose is simply
136
+ annoying.
137
+
138
+ Strictly speaking, this is a backward incompatible change and the
139
+ users need to explicitly set the variable to 'true' if they want to
140
+ resurrect the now-ignored use case.
141
+
142
+
143
+* fc/mergetools-vimdiff3 (2014-04-22) 1 commit
144
+ (merged to 'next' on 2014-04-22 at d843e75)
145
+ + mergetools: add vimdiff3 mode
146
+
147
+
148
+* fc/rerere-conflict-style (2014-04-30) 1 commit
149
+ (merged to 'next' on 2014-05-07 at bde7fd0)
150
+ + rerere: fix for merge.conflictstyle
151
+
152
+ "git rerere forget" did not work well when merge.conflictstyle
153
+ was set to a non-default value.
154
+
155
+
156
+* jc/apply-ignore-whitespace (2014-03-26) 1 commit
157
+ (merged to 'next' on 2014-04-04 at 53779a7)
158
+ + apply --ignore-space-change: lines with and without leading whitespaces do not match
159
+
160
+ "--ignore-space-change" option of "git apply" ignored the
161
+ spaces at the beginning of line too aggressively, which is
162
+ inconsistent with the option of the same name "diff" and "git diff"
163
+ have.
164
+
165
+
166
+* jk/commit-date-approxidate (2014-05-02) 4 commits
167
+ (merged to 'next' on 2014-05-07 at 7ec8f7d)
168
+ + commit: accept more date formats for "--date"
169
+ + commit: print "Date" line when the user has set date
170
+ + pretty: make show_ident_date public
171
+ + commit: use split_ident_line to compare author/committer
172
+
173
+ "git commit --date=<date>" option learned to read from more
174
+ timestamp formats, including "--date=now".
175
+
176
+
177
+* jk/external-diff-use-argv-array (2014-04-21) 5 commits
178
+ (merged to 'next' on 2014-04-22 at e6d92d7)
179
+ + run_external_diff: refactor cmdline setup logic
180
+ + run_external_diff: hoist common bits out of conditional
181
+ + run_external_diff: drop fflush(NULL)
182
+ + run_external_diff: clean up error handling
183
+ + run_external_diff: use an argv_array for the environment
184
+
185
+ Code clean-up (and a bugfix which has been merged for 2.0).
186
+
187
+
188
+* jx/blame-align-relative-time (2014-04-23) 2 commits
189
+ (merged to 'next' on 2014-04-23 at 858df39)
190
+ + blame: dynamic blame_date_width for different locales
191
+ + blame: fix broken time_buf paddings in relative timestamp
192
+
193
+ "git blame" miscounted number of columns needed to show localized
194
+ timestamps, resulting in jaggy left-side-edge of the source code
195
+ lines in its output.
196
+
197
+
198
+* ks/tree-diff-nway (2014-04-09) 20 commits
199
+ (merged to 'next' on 2014-04-09 at c17228e)
200
+ + mingw: activate alloca
201
+ (merged to 'next' on 2014-04-08 at 6b74773)
202
+ + combine-diff: speed it up, by using multiparent diff tree-walker directly
203
+ + tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
204
+ + Portable alloca for Git
205
+ (merged to 'next' on 2014-03-31 at 16a7bd4)
206
+ + tree-diff: reuse base str(buf) memory on sub-tree recursion
207
+ + tree-diff: no need to call "full" diff_tree_sha1 from show_path()
208
+ + tree-diff: rework diff_tree interface to be sha1 based
209
+ + tree-diff: diff_tree() should now be static
210
+ + tree-diff: remove special-case diff-emitting code for empty-tree cases
211
+ (merged to 'next' on 2014-03-25 at cfcbdac)
212
+ + tree-diff: simplify tree_entry_pathcmp
213
+ + tree-diff: show_path prototype is not needed anymore
214
+ + tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
215
+ + tree-diff: move all action-taking code out of compare_tree_entry()
216
+ + tree-diff: don't assume compare_tree_entry() returns -1,0,1
217
+ (merged to 'next' on 2014-03-21 at d872679)
218
+ + tree-diff: consolidate code for emitting diffs and recursion in one place
219
+ + tree-diff: show_tree() is not needed
220
+ + tree-diff: no need to pass match to skip_uninteresting()
221
+ + tree-diff: no need to manually verify that there is no mode change for a path
222
+ + combine-diff: move changed-paths scanning logic into its own function
223
+ + combine-diff: move show_log_first logic/action out of paths scanning
224
+
225
+ Instead of running N pair-wise diff-trees when inspecting a
226
+ N-parent merge, find the set of paths that were touched by walking
227
+ N+1 trees in parallel. These set of paths can then be turned into
228
+ N pair-wise diff-tree results to be processed through rename
229
+ detections and such. And N=2 case nicely degenerates to the usual
230
+ 2-way diff-tree, which is very nice.
231
+
232
+
233
+* lr/git-run-setup-gently (2014-04-22) 1 commit
234
+ (merged to 'next' on 2014-04-22 at 5c2523f)
235
+ + git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
236
+
237
+
238
+* mh/ref-transaction (2014-04-07) 27 commits
239
+ (merged to 'next' on 2014-04-16 at a99f84d)
240
+ + ref_transaction_commit(): work with transaction->updates in place
241
+ + struct ref_update: add a type field
242
+ + struct ref_update: add a lock field
243
+ + ref_transaction_commit(): simplify code using temporary variables
244
+ + struct ref_update: store refname as a FLEX_ARRAY
245
+ + struct ref_update: rename field "ref_name" to "refname"
246
+ + refs: remove API function update_refs()
247
+ + update-ref --stdin: reimplement using reference transactions
248
+ + refs: add a concept of a reference transaction
249
+ + update-ref --stdin: harmonize error messages
250
+ + update-ref --stdin: improve the error message for unexpected EOF
251
+ + t1400: test one mistake at a time
252
+ + update-ref --stdin -z: deprecate interpreting the empty string as zeros
253
+ + update-ref.c: extract a new function, parse_next_sha1()
254
+ + t1400: test that stdin -z update treats empty <newvalue> as zeros
255
+ + update-ref --stdin: simplify error messages for missing oldvalues
256
+ + update-ref --stdin: make error messages more consistent
257
+ + update-ref --stdin: improve error messages for invalid values
258
+ + update-ref.c: extract a new function, parse_refname()
259
+ + parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
260
+ + update-ref --stdin: read the whole input at once
261
+ + update_refs(): fix constness
262
+ + refs.h: rename the action_on_err constants
263
+ + t1400: add some more tests involving quoted arguments
264
+ + parse_arg(): really test that argument is properly terminated
265
+ + t1400: provide more usual input to the command
266
+ + t1400: fix name and expected result of one test
267
+
268
+ Update "update-ref --stdin [-z]" and then introduce a transactional
269
+ support for (multi-)reference updates.
270
+
271
+
272
+* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
273
+ (merged to 'next' on 2014-05-02 at 7744361)
274
+ + git-remote-mediawiki: fix encoding issue for UTF-8 media files
275
+ + git-remote-mediawiki: allow stop/start-ing the test server
276
+
277
+
278
+* nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit
279
+ (merged to 'next' on 2014-04-16 at b38d5a9)
280
+ + index-pack: work around thread-unsafe pread()
281
+
282
+ Enable threaded index-pack on platforms without thread-safe
283
+ pread() emulation.
284
+
285
+
286
+* rs/ref-update-check-errors-early (2014-04-17) 2 commits
287
+ (merged to 'next' on 2014-04-21 at acc62aa)
288
+ + commit.c: check for lock error and return early
289
+ + sequencer.c: check for lock failure and bail early in fast_forward_to
290
+
291
+
292
+* sk/msvc-dynlink-crt (2014-05-06) 1 commit
293
+ (merged to 'next' on 2014-05-07 at 20f4839)
294
+ + MSVC: link dynamically to the CRT
295
+
296
+
297
+* sk/svn-parse-datestamp (2014-04-17) 1 commit
298
+ (merged to 'next' on 2014-04-21 at 5ff519f)
299
+ + SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
300
+
301
+ "git svn" learned to cope with malformed timestamps with only one
302
+ digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted
303
+ by some broken subversion server implementations.
304
+
305
+
306
+* sk/tag-contains-wo-recursion (2014-04-25) 1 commit
307
+ (merged to 'next' on 2014-04-25 at f320750)
308
+ + git tag --contains: avoid stack overflow
309
+
310
+
311
+* ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits
312
+ (merged to 'next' on 2014-04-16 at cb92f4f)
313
+ + read-cache.c: verify index file before we opportunistically update it
314
+ + wrapper.c: add xpread() similar to xread()
315
+
316
+ Read-only operations such as "git status" that internally refreshes
317
+ the index write out the refreshed index to the disk to optimize
318
+ future accesses to the working tree, but this could race with a
319
+ "read-write" operation that modify the index while it is running.
320
+ Detect such a race and avoid overwriting the index.
321
+
322
+ Duy raised a good point that we may need to do the same for the
323
+ normal writeout codepath, not just the "opportunistic" update
324
+ codepath. While that is true, nobody sane would be running two
325
+ simultaneous operations that are clearly write-oriented competing
326
+ with each other against the same index file. So in that sense that
327
+ can be done as a less urgent follow-up for this topic.
328
+
329
--------------------------------------------------
330
[New Topics]
331
26
-* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
27
- - scripts: more "export VAR=VALUE" fixes
28
- - scripts: get rid of the non portable "export VAR=VALUE" costruct
332
+* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
333
+ - transport-helper.c: rearrange xcalloc arguments
334
+ - remote.c: rearrange xcalloc arguments
335
+ - reflog-walk.c: rearrange xcalloc arguments
336
+ - pack-revindex.c: rearrange xcalloc arguments
337
+ - notes.c: rearrange xcalloc arguments
338
+ - imap-send.c: rearrange xcalloc arguments
339
+ - http-push.c: rearrange xcalloc arguments
340
+ - diff.c: rearrange xcalloc arguments
341
+ - config.c: rearrange xcalloc arguments
342
+ - commit.c: rearrange xcalloc arguments
343
+ - builtin/remote.c: rearrange xcalloc arguments
344
+ - builtin/ls-remote.c: rearrange xcalloc arguments
345
30
- Will merge to 'next' after fixing typos in the log message.
346
+ Like calloc(3), xcalloc() takes nmemb and then size.
347
348
+ Will merge to 'next'.
349
33
-* jn/test-lint-unmoor (2014-05-23) 1 commit
34
- - test-lint: find unportable sed, echo, test, and export usage after &&
350
36
- Will merge to 'next' and keep it there for the rest of this cycle.
351
+* jk/complete-merge-pull (2014-05-27) 2 commits
352
+ - completion: add missing options for git-merge
353
+ - completion: add a note that merge options are shared
354
355
+ The completion code did not know about quite a few options that are
356
+ common between "git merge" and "git pull", and a couple of options
357
+ unique to "git merge".
358
39
-* jj/command-line-adjective (2014-05-21) 1 commit
40
- - Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
359
+ Will merge to 'next'.
360
42
- Will merge to 'next' and keep it there for the rest of this cycle.
361
362
+* jl/remote-rm-prune (2014-05-27) 3 commits
363
+ - remote prune: optimize "dangling symref" check/warning
364
+ - remote: repack packed-refs once when deleting multiple refs
365
+ - remote rm: delete remote configuration as the last
366
45
-* jk/daemon-tolower (2014-05-23) 1 commit
46
- - daemon/config: factor out duplicate xstrdup_tolower
367
+ "git remote rm" and "git remote prune" can involve removing many
368
+ refs at once, which is not a very efficient thing to do when very
369
+ many refs exist in the packed-refs file.
370
48
- Will merge to 'next' and keep it there for the rest of this cycle.
371
+ Will merge to 'next'.
372
373
51
-* jk/strbuf-tolower (2014-05-23) 1 commit
52
- - strbuf: add strbuf_tolower function
374
+* jm/instaweb-apache-24 (2014-05-27) 1 commit
375
+ - git-instaweb: add support for Apache 2.4
376
54
- Will merge to 'next' and keep it there for the rest of this cycle.
377
+ Will merge to 'next'.
378
379
57
-* jk/http-errors (2014-05-23) 8 commits
58
- - http: default text charset to iso-8859-1
59
- - remote-curl: reencode http error messages
60
- - strbuf: add strbuf_reencode helper
61
- - http: optionally extract charset parameter from content-type
62
- - http: extract type/subtype portion of content-type
63
- - t5550: test display of remote http error messages
64
- - t/lib-httpd: use write_script to copy CGI scripts
65
- - test-lib: preserve GIT_CURL_VERBOSE from the environment
380
+* jm/t9138-style-fix (2014-05-27) 1 commit
381
+ - t9138-git-svn-authors-prog.sh fixups
382
67
- The fourth from the bottom needs additional comments $gmane/250024
68
- squashed in before this is merged to 'next'.
383
+ Will merge to 'next'.
384
385
71
-* jm/format-patch-mail-sig (2014-05-22) 2 commits
72
- - format-patch: --signature-file=<file>
73
- - format-patch: make newline after signature conditional
386
+* mc/git-p4-pre-are-p4-only (2014-05-27) 1 commit
387
+ (merged to 'next' on 2014-05-27 at 71572fe)
388
+ + git-p4: Do not include diff in spec file when just preparing p4
389
+
390
+ Will merge to 'master'.
391
+
392
+
393
+* nd/daemonize-gc (2014-05-27) 1 commit
394
+ - gc --auto: do not lock refs in the background
395
+
396
+ Will merge to 'next'.
397
+
398
+
399
+* ow/config-mailmap-pathname (2014-05-27) 1 commit
400
+ - config: respect '~' and '~user' in mailmap.file
401
+
402
+ Will merge to 'next'.
403
+
404
+
405
+* rh/prompt-tests (2014-05-30) 10 commits
406
+ - t9904: new __git_ps1 tests for Zsh
407
+ - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
408
+ - lib-prompt-tests.sh: put all tests inside a function
409
+ - t9903: move prompt tests to a new lib-prompt-tests.sh file
410
+ - t9903: move PS1 color code variable definitions to lib-bash.sh
411
+ - t9903: include "Bash" in test names via new $shellname var
412
+ - t9903: run pc mode tests again with PS1 expansion disabled
413
+ - t9903: move test name prefix to a separate variable
414
+ - t9903: put the Bash pc mode prompt test cases in a function
415
+ - t9903: remove Zsh test from the suite of Bash prompt tests
416
+
417
+ Will merge to 'next'.
418
+
419
+
420
+* jm/doc-wording-tweaks (2014-05-28) 1 commit
421
+ - Documentation: wording fixes in the user manual and glossary
422
+
423
+ Will merge to 'next'.
424
+
425
+
426
+* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
427
+ - gitweb: Harden UTF-8 handling in generated links
428
+
429
+ Will merge to 'next'.
430
+
431
+
432
+* mn/sideband-no-ansi (2014-06-02) 1 commit
433
+ - sideband.c: do not use ANSI control sequence on non-terminal
434
+
435
+ Will merge to 'next'.
436
+
437
+
438
+* jc/fetch-push-refmap (2014-06-02) 9 commits
439
+ - fetch: allow explicit --refmap to override configuration
440
+ - fetch doc: add a section on configured remote-tracking branches
441
+ - fetch doc: remove "short-cut" section
442
+ - fetch doc: update refspec format description
443
+ - fetch doc: on pulling multiple refspecs
444
+ - fetch doc: remove notes on outdated "mixed layout"
445
+ - fetch doc: update note on '+' in front of the refspec
446
+ - fetch doc: move FETCH_HEAD material lower and add an example
447
+ - fetch doc: update introductory part for clarity
448
+
449
+
450
+* jc/shortlog-ref-exclude (2014-05-30) 1 commit
451
+ - shortlog: allow --exclude=<glob> to be passed
452
+
453
+ Needs rewording the proposed log message ($gmane/250469, 250475).
454
+
455
+
456
+* lt/log-auto-decorate (2014-05-30) 1 commit
457
+ - git log: support "auto" decorations
458
+
459
+ Will merge to 'next'.
460
+
461
+
462
+* lt/request-pull (2014-06-02) 1 commit
463
+ - fix brown paper bag breakage in t5150-request-pull.sh
464
+
465
+ Will merge to 'next'.
466
+
467
+
468
+* na/no-http-test-in-the-middle (2014-05-30) 1 commit
469
+ - t5538: move http push tests out to t5542
470
+
471
+ Will merge to 'next'.
472
+
473
+
474
+* pb/trim-trailing-spaces (2014-06-02) 1 commit
475
+ - dir.c:trim_trailing_spaces(): fix for " \ " sequence
476
+
477
+ Will merge to 'next'.
478
+
479
+
480
+* rs/mailinfo-header-cmp (2014-06-02) 1 commit
481
+ - mailinfo: use strcmp() for string comparison
482
+
483
+ Will merge to 'next'.
484
+
485
+
486
+* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
487
+ - pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
488
+
489
+ Will merge to 'next'.
490
+
491
+
492
+* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
493
+ - userdiff: support Java try keyword
494
+ - userdiff: support C# async methods and correct C# keywords
495
+
496
+
497
+* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
498
+ - error_resolve_conflict: drop quotations around operation
499
+ - error_resolve_conflict: rewrap advice message
500
+
501
+ Will merge to 'next'.
502
+
503
+
504
+* rs/read-ref-at (2014-06-03) 1 commit
505
+ - refs.c: change read_ref_at to use the reflog iterators
506
+
507
+ Will merge to 'next'.
508
+
509
+
510
+* sh/enable-preloadindex (2014-06-03) 1 commit
511
+ - environment.c: enable core.preloadindex by default
512
75
- Looked more-or-less ready, except for some negative tests.
513
+ Will merge to 'next'.
514
515
516
+* ta/string-list-init (2014-06-03) 1 commit
517
+ - string-list: Add a value to string_list initializer lists
518
+
519
+ Will merge to 'next'.
520
+
521
--------------------------------------------------
522
[Stalled]
523
524
+* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
525
+ - commit -m: commit staged submodules regardless of ignore config
526
+ - status/commit: show staged submodules regardless of ignore config
527
+
528
+ There also are a few patches Ronald Weiss and Jens are working on
529
+ polishing around this topic, and a patch from Jens each for gitk
530
+ and git-gui.
531
+
532
+ Waiting for the dust to settle until picking them up all.
533
+
534
+
535
+* mh/lockfile (2014-04-15) 25 commits
536
+ - trim_last_path_elm(): replace last_path_elm()
537
+ - resolve_symlink(): take a strbuf parameter
538
+ - resolve_symlink(): use a strbuf for internal scratch space
539
+ - change lock_file::filename into a strbuf
540
+ - commit_lock_file(): use a strbuf to manage temporary space
541
+ - try_merge_strategy(): use a statically-allocated lock_file object
542
+ - try_merge_strategy(): remove redundant lock_file allocation
543
+ - struct lock_file: declare some fields volatile
544
+ - lockfile: avoid transitory invalid states
545
+ - commit_lock_file(): die() if called for unlocked lockfile object
546
+ - commit_lock_file(): inline temporary variable
547
+ - remove_lock_file(): call rollback_lock_file()
548
+ - lock_file(): exit early if lockfile cannot be opened
549
+ - write_packed_entry_fn(): convert cb_data into a (const int *)
550
+ - prepare_index(): declare return value to be (const char *)
551
+ - delete_ref_loose(): don't muck around in the lock_file's filename
552
+ - cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
553
+ - lockfile.c: document the various states of lock_file objects
554
+ - lock_file(): always add lock_file object to lock_file_list
555
+ - hold_lock_file_for_append(): release lock on errors
556
+ - lockfile: unlock file if lockfile permissions cannot be adjusted
557
+ - rollback_lock_file(): set fd to -1
558
+ - rollback_lock_file(): do not clear filename redundantly
559
+ - api-lockfile: expand the documentation
560
+ - unable_to_lock_die(): rename function from unable_to_lock_index_die()
561
+
562
+ Refactor and fix corner-case bugs in the lockfile API, all looked
563
+ sensible.
564
+
565
+ Expecting a reroll.
566
+
567
+
568
+* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
569
+ - git-rebase: print name of rev when using shorthand
570
+
571
+ Teach "git rebase -" to report the concrete name of the branch
572
+ (i.e. the previous one).
573
+
574
+ But it stops short and does not do the same for "git rebase @{-1}".
575
+ Expecting a reroll.
576
+
577
+
578
* tr/merge-recursive-index-only (2014-02-05) 3 commits
579
- merge-recursive: -Xindex-only to leave worktree unchanged
580
- merge-recursive: internal flag to avoid touching the worktree
@@ -243,22 +740,79 @@ of the repositories listed at
740
--------------------------------------------------
741
[Cooking]
742
743
+* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
744
+ (merged to 'next' on 2014-05-23 at 7699c0e)
745
+ + scripts: more "export VAR=VALUE" fixes
746
+ + scripts: "export VAR=VALUE" construct is not portable
747
+
748
+ Will merge to 'master'.
749
+
750
+
751
+* jn/test-lint-unmoor (2014-05-23) 1 commit
752
+ (merged to 'next' on 2014-05-23 at aa997bc)
753
+ + test-lint: find unportable sed, echo, test, and export usage after &&
754
+
755
+ Will merge to 'master'.
756
+
757
+
758
+* jj/command-line-adjective (2014-05-21) 1 commit
759
+ (merged to 'next' on 2014-05-23 at fe136c8)
760
+ + Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
761
+
762
+ Will merge to 'master'.
763
+
764
+
765
+* jk/daemon-tolower (2014-05-23) 1 commit
766
+ (merged to 'next' on 2014-05-23 at 23c796d)
767
+ + daemon/config: factor out duplicate xstrdup_tolower
768
+
769
+ Will merge to 'master'.
770
+
771
+
772
+* jk/strbuf-tolower (2014-05-23) 1 commit
773
+ (merged to 'next' on 2014-05-23 at b172137)
774
+ + strbuf: add strbuf_tolower function
775
+
776
+ Will merge to 'master'.
777
+
778
+
779
+* jk/http-errors (2014-05-27) 8 commits
780
+ - http: default text charset to iso-8859-1
781
+ - remote-curl: reencode http error messages
782
+ - strbuf: add strbuf_reencode helper
783
+ - http: optionally extract charset parameter from content-type
784
+ - http: extract type/subtype portion of content-type
785
+ - t5550: test display of remote http error messages
786
+ - t/lib-httpd: use write_script to copy CGI scripts
787
+ - test-lib: preserve GIT_CURL_VERBOSE from the environment
788
+
789
+ Will merge to 'next'.
790
+
791
+
792
+* jm/format-patch-mail-sig (2014-05-27) 2 commits
793
+ - format-patch: add "--signature-file=<file>" option
794
+ - format-patch: make newline after signature conditional
795
+
796
+ Will merge to 'next'.
797
+
798
+
799
* sk/wincred (2014-05-14) 2 commits
800
(merged to 'next' on 2014-05-21 at a3b9ca3)
801
+ wincred: avoid overwriting configured variables
802
+ wincred: add install target
803
251
- Will keep in 'next' for the remainder of the cycle.
804
+ Will merge to 'master'.
805
806
807
* as/pretty-truncate (2014-05-21) 5 commits
255
- - pretty.c: format string with truncate respects logOutputEncoding
256
- - t4205, t6006: add tests that fail with i18n.logOutputEncoding set
257
- - t4205 (log-pretty-format): use `tformat` rather than `format`
258
- - t4041, t4205, t6006, t7102: don't hardcode tested encoding value
259
- - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
808
+ (merged to 'next' on 2014-05-23 at 94d4c51)
809
+ + pretty.c: format string with truncate respects logOutputEncoding
810
+ + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
811
+ + t4205 (log-pretty-format): use `tformat` rather than `format`
812
+ + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
813
+ + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
814
261
- Will merge to 'next' and keep it there for the rest of this cycle.
815
+ Will merge to 'master'.
816
817
818
* cc/replace-graft (2014-05-19) 1 commit
@@ -266,7 +820,7 @@ of the repositories listed at
820
+ replace: add --graft option
821
(this branch uses cc/replace-edit.)
822
269
- Will keep in 'next' for the remainder of the cycle.
823
+ Will eject from 'next' and replace with a newer reroll.
824
825
826
* jk/argv-array-for-child-process (2014-05-15) 7 commits
@@ -279,28 +833,28 @@ of the repositories listed at
833
+ run_column_filter: use argv_array
834
+ run-command: store an optional argv_array
835
282
- Will keep in 'next' for the remainder of the cycle.
836
+ Will merge to 'master'.
837
838
839
* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
840
(merged to 'next' on 2014-05-21 at 142d2c8)
841
+ run_diff_files: do not look at uninitialized stat data
842
289
- Will keep in 'next' for the remainder of the cycle.
843
+ Will merge to 'master'.
844
845
846
* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
847
(merged to 'next' on 2014-05-21 at 77c89fe)
848
+ open_sha1_file: report "most interesting" errno
849
296
- Will keep in 'next' for the remainder of the cycle.
850
+ Will merge to 'master'.
851
852
853
* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
854
(merged to 'next' on 2014-05-21 at d87d266)
855
+ rebase --keep-empty -i: add test
856
303
- Will keep in 'next' for the remainder of the cycle.
857
+ Will merge to 'master'.
858
859
860
* nd/status-auto-comment-char (2014-05-19) 2 commits
@@ -308,7 +862,7 @@ of the repositories listed at
862
+ commit: allow core.commentChar=auto for character auto selection
863
+ config: be strict on core.commentChar
864
311
- Will keep in 'next' for the remainder of the cycle.
865
+ Will merge to 'master'.
866
867
868
* rr/rebase-autostash-fix (2014-05-20) 2 commits
@@ -316,27 +870,28 @@ of the repositories listed at
870
+ rebase -i: test "Nothing to do" case with autostash
871
+ rebase -i: handle "Nothing to do" case with autostash
872
319
- Will keep in 'next' for the remainder of the cycle.
873
+ Will merge to 'master'.
874
875
876
* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
877
(merged to 'next' on 2014-05-21 at eb28305)
878
+ git grep -O -i: if the pager is 'less', pass the '-I' option
879
326
- Will keep in 'next' for the remainder of the cycle.
880
+ Will merge to 'master'.
881
882
883
* sk/windows-unc-path (2014-05-20) 1 commit
884
(merged to 'next' on 2014-05-21 at d1f1350)
885
+ Windows: Allow using UNC path for git repository
886
333
- Will keep in 'next' for the remainder of the cycle.
887
+ Will merge to 'master'.
888
889
890
* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
337
- - move "--follow needs one pathspec" rule to diff_setup_done
891
+ (merged to 'next' on 2014-05-23 at 4653133)
892
+ + move "--follow needs one pathspec" rule to diff_setup_done
893
339
- Will merge to 'next' and keep it there for the rest of this cycle.
894
+ Will merge to 'master'.
895
896
897
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
@@ -350,14 +905,14 @@ of the repositories listed at
905
(merged to 'next' on 2014-05-21 at 676392b)
906
+ t/lib-httpd: require SANITY prereq
907
353
- Will keep in 'next' for the remainder of the cycle.
908
+ Will merge to 'master'.
909
910
911
* jk/index-pack-report-missing (2014-05-12) 1 commit
912
(merged to 'next' on 2014-05-14 at 72d40e1)
913
+ index-pack: distinguish missing objects from type errors
914
360
- Will keep in 'next' for the remainder of the cycle.
915
+ Will merge to 'master'.
916
917
918
* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
@@ -372,21 +927,21 @@ of the repositories listed at
927
We may want to let the users choose if codepoints with ambiguous
928
widths are treated as a double or single width in a follow-up patch.
929
375
- Will keep in 'next' for the remainder of the cycle.
930
+ Will merge to 'master'.
931
932
933
* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
934
(merged to 'next' on 2014-05-21 at 3b98b35)
935
+ git-show: fix 'git show -s' to not add extra terminator after merge commit
936
382
- Will keep in 'next' for the remainder of the cycle.
937
+ Will merge to 'master'.
938
939
940
* wk/doc-clarify-upstream (2014-05-13) 1 commit
941
(merged to 'next' on 2014-05-14 at 6c8fb52)
942
+ Documentation: mention config sources for @{upstream}
943
389
- Will keep in 'next' for the remainder of the cycle.
944
+ Will merge to 'master'.
945
946
947
* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
@@ -395,23 +950,23 @@ of the repositories listed at
950
951
The original 16 MiB limit for the in-core delta-base-cache
952
introduced in 18bdec11 (Limit the size of the new delta_base_cache,
398
- 2007-03-19) is turning too small.
953
+ 2007-03-19) is turning out to be too small.
954
400
- Will keep in 'next' for the remainder of the cycle.
955
+ Will merge to 'master'.
956
957
958
* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
959
(merged to 'next' on 2014-05-12 at 6b04e23)
960
+ silence a bunch of format-zero-length warnings
961
407
- Will keep in 'next' for the remainder of the cycle.
962
+ Will merge to 'master'.
963
964
965
* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
966
(merged to 'next' on 2014-05-12 at 065cb22)
967
+ grep: use run-command's "dir" option for --open-files-in-pager
968
414
- Will keep in 'next' for the remainder of the cycle.
969
+ Will merge to 'master'.
970
971
972
* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
@@ -419,7 +974,7 @@ of the repositories listed at
974
+ let clang use the constant-return error() macro
975
+ inline constant return from error() function
976
422
- Will keep in 'next' for the remainder of the cycle.
977
+ Will merge to 'master'.
978
979
980
* rs/reflog-exists (2014-05-08) 2 commits
@@ -427,21 +982,21 @@ of the repositories listed at
982
+ checkout.c: use ref_exists instead of file_exist
983
+ refs.c: add new functions reflog_exists and delete_reflog
984
430
- Will keep in 'next' for the remainder of the cycle.
985
+ Will merge to 'master'.
986
987
988
* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
989
(merged to 'next' on 2014-05-12 at 0b7db32)
990
+ builtin/tag.c: show tag name to hint in the message editor
991
437
- Will keep in 'next' for the remainder of the cycle.
992
+ Will merge to 'master'.
993
994
995
* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
996
(merged to 'next' on 2014-05-14 at 83a05d9)
997
+ Revert "submodules: fix ambiguous absolute paths under Windows"
998
444
- Will keep in 'next' for the remainder of the cycle.
999
+ Will merge to 'master'.
1000
1001
1002
* jn/contrib-remove-diffall (2014-05-09) 1 commit
@@ -450,7 +1005,7 @@ of the repositories listed at
1005
1006
Spring cleaning of contrib/.
1007
453
- Will keep in 'next' for the remainder of the cycle.
1008
+ Will merge to 'master'.
1009
1010
1011
* jn/contrib-remove-vim (2014-05-09) 1 commit
@@ -459,52 +1014,33 @@ of the repositories listed at
1014
1015
Spring cleaning of contrib/.
1016
462
- Will keep in 'next' for the remainder of the cycle.
1017
+ Will merge to 'master'.
1018
1019
465
-* ss/howto-manage-trunk (2014-05-09) 8 commits
466
- - SQUASH describe what the picture shows
467
- - SQUASH minor typographic fix
468
- - SQUASH clarify the informal description of 'trunk'
469
- - SQUASH typeset literal commands with `git command`
470
- - SQUASH use a better URL
471
- - SQUASH mark-up fix
472
- - SQUASH typofix
473
- - How to keep a project's canonical history correct.
1020
+* ss/howto-manage-trunk (2014-05-28) 1 commit
1021
+ (merged to 'next' on 2014-05-28 at 5318336)
1022
+ + How to keep a project's canonical history correct.
1023
475
- Will squash and then merge to 'next'.
1024
+ Will merge to 'master'.
1025
1026
1027
* wg/svn-fe-style-fixes (2014-05-12) 1 commit
1028
(merged to 'next' on 2014-05-12 at 88c0e0d)
1029
+ svn-fe: conform to pep8
1030
482
- Will keep in 'next' for the remainder of the cycle.
483
-
484
-
485
-* bg/strbuf-trim (2014-05-06) 2 commits
486
- (merged to 'next' on 2014-05-07 at 978f378)
487
- + api-strbuf.txt: add docs for _trim and _ltrim
488
- + strbuf: use _rtrim and _ltrim in strbuf_trim
489
-
490
- Will keep in 'next' for the remainder of the cycle.
1031
+ Will merge to 'master'.
1032
1033
493
-* cb/byte-order (2014-05-02) 2 commits
1034
+* cb/byte-order (2014-05-30) 3 commits
1035
+ (merged to 'next' on 2014-05-30 at 857617e)
1036
+ + compat/bswap.h: fix endianness detection
1037
(merged to 'next' on 2014-05-07 at f55c040)
1038
+ compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
1039
+ compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
1040
1041
Compatibility enhancement for Solaris.
1042
500
- Will keep in 'next' for the remainder of the cycle.
501
-
502
-
503
-* dt/api-doc-setup-gently (2014-04-30) 1 commit
504
- (merged to 'next' on 2014-05-07 at 6054b08)
505
- + docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
506
-
507
- Will keep in 'next' for the remainder of the cycle.
1043
+ Will merge to 'master'.
1044
1045
1046
* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
@@ -512,29 +1048,16 @@ of the repositories listed at
1048
+ mv: allow renaming to fix case on case insensitive filesystems
1049
+ merge-recursive.c: fix case-changing merge bug
1050
515
- On a case insensitive filesystem, merge-recursive incorrectly
516
- deleted the file that is to be renamed to a name that is the same
517
- except for case differences.
518
-
519
- Will keep in 'next' for the remainder of the cycle.
520
-
521
-
522
-* ew/config-protect-mode (2014-05-06) 1 commit
523
- (merged to 'next' on 2014-05-07 at 8443093)
524
- + config: preserve config file permissions on edits
525
-
526
- Will keep in 'next' for the remainder of the cycle.
527
-
528
-
529
-* fc/rerere-conflict-style (2014-04-30) 1 commit
530
- (merged to 'next' on 2014-05-07 at bde7fd0)
531
- + rerere: fix for merge.conflictstyle
532
-
533
- Will keep in 'next' for the remainder of the cycle.
1051
+ On a case insensitive filesystem, merge-recursive incorrectly
1052
+ deleted the file that is to be renamed to a name that is the same
1053
+ except for case differences.
1054
+
1055
+ Will merge to 'master'.
1056
1057
1058
* jc/coding-guidelines (2014-05-20) 9 commits
537
- - CodingGuidelines: avoid "test <cond> -a/-o <cond>"
1059
+ (merged to 'next' on 2014-05-23 at bb351fc)
1060
+ + CodingGuidelines: avoid "test <cond> -a/-o <cond>"
1061
(merged to 'next' on 2014-05-12 at e1fcf62)
1062
+ CodingGuidelines: on splitting a long line
1063
+ CodingGuidelines: on comparison
@@ -545,7 +1068,7 @@ of the repositories listed at
1068
+ CodingGuidelines: give an example for case/esac statement
1069
+ CodingGuidelines: once it is in, it is not worth the code churn
1070
548
- Will merge to 'next' and keep it there for the rest of this cycle.
1071
+ Will merge to 'master'.
1072
1073
1074
* jd/subtree (2014-05-13) 6 commits
@@ -558,31 +1081,14 @@ of the repositories listed at
1081
+ contrib/subtree/Makefile: use GIT-VERSION-FILE
1082
+ contrib/subtree/Makefile: scrap unused $(gitdir)
1083
561
- Will keep in 'next' for the remainder of the cycle.
562
-
563
-
564
-* jk/commit-date-approxidate (2014-05-02) 4 commits
565
- (merged to 'next' on 2014-05-07 at 7ec8f7d)
566
- + commit: accept more date formats for "--date"
567
- + commit: print "Date" line when the user has set date
568
- + pretty: make show_ident_date public
569
- + commit: use split_ident_line to compare author/committer
570
-
571
- Will keep in 'next' for the remainder of the cycle.
1084
+ Will merge to 'master'.
1085
1086
1087
* mm/pager-less-sans-S (2014-05-07) 1 commit
1088
(merged to 'next' on 2014-05-07 at 66ce999)
1089
+ pager: remove 'S' from $LESS by default
1090
578
- Will keep in 'next' for the remainder of the cycle.
579
-
580
-
581
-* sk/msvc-dynlink-crt (2014-05-06) 1 commit
582
- (merged to 'next' on 2014-05-07 at 20f4839)
583
- + MSVC: link dynamically to the CRT
584
-
585
- Will keep in 'next' for the remainder of the cycle.
1091
+ Will merge to 'master'.
1092
1093
1094
* cc/replace-edit (2014-05-19) 10 commits
@@ -602,7 +1108,7 @@ of the repositories listed at
1108
1109
"git replace" learns a new "--edit" option.
1110
605
- Will keep in 'next' for the remainder of the cycle.
1111
+ Will merge to 'master'.
1112
1113
1114
* da/imap-send-use-credential-helper (2014-04-29) 1 commit
@@ -612,14 +1118,14 @@ of the repositories listed at
1118
"git imap-send" learns to ask the credential helper for
1119
authentication material.
1120
615
- Will keep in 'next' for the remainder of the cycle.
1121
+ Will merge to 'master'.
1122
1123
1124
* dk/blame-reorg (2014-04-28) 1 commit
1125
(merged to 'next' on 2014-05-14 at 354a0e3)
1126
+ blame: large-scale performance rewrite
1127
622
- Will keep in 'next' for the remainder of the cycle.
1128
+ Will merge to 'master'.
1129
1130
1131
* je/pager-do-not-recurse (2014-04-28) 1 commit
@@ -630,7 +1136,7 @@ of the repositories listed at
1136
we spawn to feed out output, but that prevents people who want to
1137
run less within less from doing so.
1138
633
- Will keep in 'next' for the remainder of the cycle.
1139
+ Will merge to 'master'.
1140
1141
1142
* jk/commit-C-pick-empty (2014-04-28) 1 commit
@@ -640,373 +1146,125 @@ of the repositories listed at
1146
"git commit --allow-empty-message -C $commit" did not work when the
1147
commit did not have any log message.
1148
643
- Will keep in 'next' for the remainder of the cycle.
644
-
645
-
646
-* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
647
- (merged to 'next' on 2014-05-12 at 948823c)
648
- + t3910: show failure of core.precomposeunicode with decomposed filenames
649
-
650
- Document a known breakage with a test.
651
-
652
- Will keep in 'next' for the remainder of the cycle.
653
-
654
-
655
-* mt/send-email-cover-to-cc (2014-04-29) 2 commits
656
- (merged to 'next' on 2014-05-12 at b696006)
657
- + test/send-email: to-cover, cc-cover tests
658
- + git-send-email: two new options: to-cover, cc-cover
659
-
660
- Will keep in 'next' for the remainder of the cycle.
661
-
662
-
663
-* nd/split-index (2014-04-29) 33 commits
664
- - SQUASH???
665
- - t1700: new tests for split-index mode
666
- - t2104: make sure split index mode is off for the version test
667
- - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
668
- - read-tree: note about dropping split-index mode or index version
669
- - read-tree: force split-index mode off on --index-output
670
- - rev-parse: add --shared-index-path to get shared index path
671
- - update-index --split-index: do not split if $GIT_DIR is read only
672
- - update-index: new options to enable/disable split index mode
673
- - split-index: strip pathname of on-disk replaced entries
674
- - split-index: do not invalidate cache-tree at read time
675
- - split-index: the reading part
676
- - split-index: the writing part
677
- - read-cache: mark updated entries for split index
678
- - read-cache: save deleted entries in split index
679
- - read-cache: mark new entries for split index
680
- - read-cache: split-index mode
681
- - read-cache: save index SHA-1 after reading
682
- - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
683
- - cache-tree: mark istate->cache_changed on prime_cache_tree()
684
- - cache-tree: mark istate->cache_changed on cache tree update
685
- - cache-tree: mark istate->cache_changed on cache tree invalidation
686
- - unpack-trees: be specific what part of the index has changed
687
- - resolve-undo: be specific what part of the index has changed
688
- - update-index: be specific what part of the index has changed
689
- - read-cache: be specific what part of the index has changed
690
- - read-cache: be strict about "changed" in remove_marked_cache_entries()
691
- - read-cache: store in-memory flags in the first 12 bits of ce_flags
692
- - read-cache: relocate and unexport commit_locked_index()
693
- - read-cache: new API write_locked_index instead of write_index/write_cache
694
- - sequencer: do not update/refresh index if the lock cannot be held
695
- - ewah: delete unused ewah_read_mmap_native declaration
696
- - ewah: fix constness of ewah_read_mmap
697
-
698
- The tip one is a reminder that needs to be squashed to squelch
699
- a "may be unused" compilation warning that is a false positive.
700
-
701
-
702
-* tl/relax-in-poll-emulation (2014-04-29) 1 commit
703
- (merged to 'next' on 2014-05-12 at 9369b08)
704
- + compat/poll: sleep 1 millisecond to avoid busy wait
705
-
706
- Will keep in 'next' for the remainder of the cycle.
707
-
708
-
709
-* bc/blame-crlf-test (2014-05-08) 1 commit
710
- (merged to 'next' on 2014-05-14 at b819505)
711
- + blame: correctly handle files regardless of autocrlf
712
-
713
- If a file contained CRLF line endings in a repository with
714
- core.autocrlf=input, then blame always marked lines as "Not
715
- Committed Yet", even if they were unmodified.
716
-
717
- Will keep in 'next' for the remainder of the cycle.
718
-
719
-
720
-* ep/shell-command-substitution (2014-04-30) 41 commits
721
- (merged to 'next' on 2014-05-07 at e9952c7)
722
- + t5000-tar-tree.sh: use the $( ... ) construct for command substitution
723
- + t4204-patch-id.sh: use the $( ... ) construct for command substitution
724
- + t4119-apply-config.sh: use the $( ... ) construct for command substitution
725
- + t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
726
- + t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
727
- + t4038-diff-combined.sh: use the $( ... ) construct for command substitution
728
- + t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
729
- + t4014-format-patch.sh: use the $( ... ) construct for command substitution
730
- + t4013-diff-various.sh: use the $( ... ) construct for command substitution
731
- + t4012-diff-binary.sh: use the $( ... ) construct for command substitution
732
- + t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
733
- + t4006-diff-mode.sh: use the $( ... ) construct for command substitution
734
- + t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
735
- + t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
736
- + t1050-large.sh: use the $( ... ) construct for command substitution
737
- + t1020-subdirectory.sh: use the $( ... ) construct for command substitution
738
- + t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
739
- + t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
740
- + t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
741
- + t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
742
- + t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
743
- + t0300-credentials.sh: use the $( ... ) construct for command substitution
744
- + t0030-stripspace.sh: use the $( ... ) construct for command substitution
745
- + t0026-eol-config.sh: use the $( ... ) construct for command substitution
746
- + t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
747
- + t0020-crlf.sh: use the $( ... ) construct for command substitution
748
- + t0010-racy-git.sh: use the $( ... ) construct for command substitution
749
- + t0001-init.sh: use the $( ... ) construct for command substitution
750
- + p5302-pack-index.sh: use the $( ... ) construct for command substitution
751
- + lib-gpg.sh: use the $( ... ) construct for command substitution
752
- + lib-cvs.sh: use the $( ... ) construct for command substitution
753
- + lib-credential.sh: use the $( ... ) construct for command substitution
754
- + git-web--browse.sh: use the $( ... ) construct for command substitution
755
- + git-stash.sh: use the $( ... ) construct for command substitution
756
- + git-rebase.sh: use the $( ... ) construct for command substitution
757
- + git-rebase--merge.sh: use the $( ... ) construct for command substitution
758
- + git-pull.sh: use the $( ... ) construct for command substitution
759
- + appp.sh: use the $( ... ) construct for command substitution
760
- + t7900-subtree.sh: use the $( ... ) construct for command substitution
761
- + test-gitmw-lib.sh: use the $( ... ) construct for command substitution
762
- + t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
763
-
764
- Adjust shell scripts to use $(cmd) instead of `cmd`.
765
-
766
- Will keep in 'next' for the remainder of the cycle.
767
-
768
-
769
-* ib/test-selectively-run (2014-05-21) 4 commits
770
- - t0000-*.sh: Fix the GIT_SKIP_TESTS sub-tests
771
- - test-lib: '--run' to run only specific tests
772
- - test-lib: tests skipped by GIT_SKIP_TESTS say so
773
- - test-lib: Document short options in t/README
774
-
775
- Allow specifying only certain individual test pieces to be run
776
- using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
777
-
778
-
779
-* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
780
- (merged to 'next' on 2014-05-02 at 7744361)
781
- + git-remote-mediawiki: fix encoding issue for UTF-8 media files
782
- + git-remote-mediawiki: allow stop/start-ing the test server
783
-
784
- Will keep in 'next' for the remainder of the cycle.
785
-
786
-
787
-* sk/tag-contains-wo-recursion (2014-04-25) 1 commit
788
- (merged to 'next' on 2014-04-25 at f320750)
789
- + git tag --contains: avoid stack overflow
790
-
791
- Will keep in 'next' for the remainder of the cycle.
792
-
793
-
794
-* fc/remote-helper-refmap (2014-04-21) 8 commits
795
- (merged to 'next' on 2014-04-22 at fb5a4c2)
796
- + transport-helper: remove unnecessary strbuf resets
797
- + transport-helper: add support to delete branches
798
- + fast-export: add support to delete refs
799
- + fast-import: add support to delete refs
800
- + transport-helper: add support to push symbolic refs
801
- + transport-helper: add support for old:new refspec
802
- + fast-export: add new --refspec option
803
- + fast-export: improve argument parsing
804
-
805
- Allow remote-helper/fast-import based transport to rename the refs
806
- while transferring the history.
807
-
808
- Will keep in 'next' for the remainder of the cycle.
809
-
810
-
811
-* jk/external-diff-use-argv-array (2014-04-21) 5 commits
812
- (merged to 'next' on 2014-04-22 at e6d92d7)
813
- + run_external_diff: refactor cmdline setup logic
814
- + run_external_diff: hoist common bits out of conditional
815
- + run_external_diff: drop fflush(NULL)
816
- + run_external_diff: clean up error handling
817
- + run_external_diff: use an argv_array for the environment
818
-
819
- Code clean-up (and a bugfix which has been merged for 2.0).
820
-
821
- Will keep in 'next' for the remainder of the cycle.
822
-
823
-
824
-* jx/blame-align-relative-time (2014-04-23) 2 commits
825
- (merged to 'next' on 2014-04-23 at 858df39)
826
- + blame: dynamic blame_date_width for different locales
827
- + blame: fix broken time_buf paddings in relative timestamp
828
-
829
- "git blame" miscounted number of columns needed to show localized
830
- timestamps, resulting in jaggy left-side-edge of the source code
831
- lines in its output.
832
-
833
- Will keep in 'next' for the remainder of the cycle.
834
-
835
-
836
-* fc/merge-default-to-upstream (2014-04-22) 1 commit
837
- (merged to 'next' on 2014-04-22 at 4f98483)
838
- + merge: enable defaulttoupstream by default
839
-
840
- "git merge" without argument, even when there is an upstream
841
- defined for the current branch, refused to run until
842
- merge.defaultToUpstream is set to true. Flip the default of that
843
- configuration variable to true.
844
-
845
- Will keep in 'next' for the remainder of the cycle.
846
-
847
-
848
-* fc/mergetool-prompt (2014-04-24) 2 commits
849
- (merged to 'next' on 2014-05-02 at a554691)
850
- + mergetool: document the default for --[no-]prompt
851
- (merged to 'next' on 2014-04-22 at dcaec94)
852
- + mergetool: run prompt only if guessed tool
853
-
854
- mergetool.prompt used to default to 'true', always causing a confirmation
855
- "do you really want to run the tool on this path" to be shown.
856
-
857
- Among the two purposes the prompt serves, ignore the use case to
858
- confirm that the user wants to view particular path with the named
859
- tool, and make the prompt only to confirm the choice of the tool
860
- made by autodetection and defaulting. For those who configured the
861
- tool explicitly, the prompt shown for the latter purpose is simply
862
- annoying.
863
-
864
- Strictly speaking, this is a backward incompatible change and the
865
- users need to explicitly set the variable to 'true' if they want to
866
- resurrect the now-ignored use case.
867
-
868
- Will keep in 'next' for the remainder of the cycle.
869
-
870
-
871
-* fc/mergetools-vimdiff3 (2014-04-22) 1 commit
872
- (merged to 'next' on 2014-04-22 at d843e75)
873
- + mergetools: add vimdiff3 mode
874
-
875
- Will keep in 'next' for the remainder of the cycle.
876
-
877
-
878
-* lr/git-run-setup-gently (2014-04-22) 1 commit
879
- (merged to 'next' on 2014-04-22 at 5c2523f)
880
- + git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
881
-
882
- Will keep in 'next' for the remainder of the cycle.
883
-
884
-
885
-* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
886
- - git-gui: show staged submodules regardless of ignore config
887
-
888
- Tentatively queued what I expect to receive via Pat Thoyts.
889
-
890
-
891
-* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
892
- - gitk: show staged submodules regardless of ignore config
893
- - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
894
- - l10n: Init Vietnamese translation
895
-
896
- Tentatively queued what I expect to receive via Paul Mackerras.
897
-
1149
+ Will merge to 'master'.
1150
899
-* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
900
- - git-rebase: print name of rev when using shorthand
1151
902
- Teach "git rebase -" to report the concrete name of the branch
903
- (i.e. the previous one).
1152
+* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
1153
+ (merged to 'next' on 2014-05-12 at 948823c)
1154
+ + t3910: show failure of core.precomposeunicode with decomposed filenames
1155
905
- But it stops short and does not do the same for "git rebase @{-1}".
906
- Expecting a reroll.
1156
+ Document a known breakage with a test.
1157
1158
+ Will merge to 'master'.
1159
909
-* ef/send-email-absolute-path-to-the-command (2014-04-23) 2 commits
910
- (merged to 'next' on 2014-04-23 at a657e5e)
911
- + send-email: windows drive prefix (e.g. C:) appears only at the beginning
912
- (merged to 'next' on 2014-04-21 at 43bebb5)
913
- + send-email: recognize absolute path on Windows
1160
915
- Will keep in 'next' for the remainder of the cycle.
1161
+* mt/send-email-cover-to-cc (2014-04-29) 2 commits
1162
+ (merged to 'next' on 2014-05-12 at b696006)
1163
+ + test/send-email: to-cover, cc-cover tests
1164
+ + git-send-email: two new options: to-cover, cc-cover
1165
1166
+ Will merge to 'master'.
1167
918
-* jh/submodule-tests (2014-04-17) 1 commit
919
- - t7410: 210 tests for various 'git submodule update' scenarios
1168
1169
+* nd/split-index (2014-06-02) 34 commits
1170
+ - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
1171
+ - SQUASH???
1172
+ - t1700: new tests for split-index mode
1173
+ - t2104: make sure split index mode is off for the version test
1174
+ - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
1175
+ - read-tree: note about dropping split-index mode or index version
1176
+ - read-tree: force split-index mode off on --index-output
1177
+ - rev-parse: add --shared-index-path to get shared index path
1178
+ - update-index --split-index: do not split if $GIT_DIR is read only
1179
+ - update-index: new options to enable/disable split index mode
1180
+ - split-index: strip pathname of on-disk replaced entries
1181
+ - split-index: do not invalidate cache-tree at read time
1182
+ - split-index: the reading part
1183
+ - split-index: the writing part
1184
+ - read-cache: mark updated entries for split index
1185
+ - read-cache: save deleted entries in split index
1186
+ - read-cache: mark new entries for split index
1187
+ - read-cache: split-index mode
1188
+ - read-cache: save index SHA-1 after reading
1189
+ - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
1190
+ - cache-tree: mark istate->cache_changed on prime_cache_tree()
1191
+ - cache-tree: mark istate->cache_changed on cache tree update
1192
+ - cache-tree: mark istate->cache_changed on cache tree invalidation
1193
+ - unpack-trees: be specific what part of the index has changed
1194
+ - resolve-undo: be specific what part of the index has changed
1195
+ - update-index: be specific what part of the index has changed
1196
+ - read-cache: be specific what part of the index has changed
1197
+ - read-cache: be strict about "changed" in remove_marked_cache_entries()
1198
+ - read-cache: store in-memory flags in the first 12 bits of ce_flags
1199
+ - read-cache: relocate and unexport commit_locked_index()
1200
+ - read-cache: new API write_locked_index instead of write_index/write_cache
1201
+ - sequencer: do not update/refresh index if the lock cannot be held
1202
+ - ewah: delete unused ewah_read_mmap_native declaration
1203
+ - ewah: fix constness of ewah_read_mmap
1204
922
-* rs/ref-update-check-errors-early (2014-04-17) 2 commits
923
- (merged to 'next' on 2014-04-21 at acc62aa)
924
- + commit.c: check for lock error and return early
925
- + sequencer.c: check for lock failure and bail early in fast_forward_to
1205
+ The tip two remind us the need for a minor reroll. If I find time
1206
+ I could try to squash them myself, but it is low priority for me.
1207
927
- Will keep in 'next' for the remainder of the cycle.
1208
1209
+* tl/relax-in-poll-emulation (2014-04-29) 1 commit
1210
+ (merged to 'next' on 2014-05-12 at 9369b08)
1211
+ + compat/poll: sleep 1 millisecond to avoid busy wait
1212
930
-* sk/svn-parse-datestamp (2014-04-17) 1 commit
931
- (merged to 'next' on 2014-04-21 at 5ff519f)
932
- + SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
1213
+ Will merge to 'master'.
1214
934
- Will keep in 'next' for the remainder of the cycle.
1215
1216
+* bc/blame-crlf-test (2014-05-08) 1 commit
1217
+ (merged to 'next' on 2014-05-14 at b819505)
1218
+ + blame: correctly handle files regardless of autocrlf
1219
937
-* nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit
938
- (merged to 'next' on 2014-04-16 at b38d5a9)
939
- + index-pack: work around thread-unsafe pread()
1220
+ If a file contained CRLF line endings in a repository with
1221
+ core.autocrlf=input, then blame always marked lines as "Not
1222
+ Committed Yet", even if they were unmodified.
1223
941
- Enable threaded index-pack on platforms without thread-unsafe
942
- pread() emulation.
1224
+ Will merge to 'master'.
1225
944
- Will keep in 'next' for the remainder of the cycle.
1226
1227
+* ib/test-selectively-run (2014-05-21) 4 commits
1228
+ - t0000-*.sh: Fix the GIT_SKIP_TESTS sub-tests
1229
+ - test-lib: '--run' to run only specific tests
1230
+ - test-lib: tests skipped by GIT_SKIP_TESTS say so
1231
+ - test-lib: Document short options in t/README
1232
947
-* ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits
948
- (merged to 'next' on 2014-04-16 at cb92f4f)
949
- + read-cache.c: verify index file before we opportunistically update it
950
- + wrapper.c: add xpread() similar to xread()
1233
+ Allow specifying only certain individual test pieces to be run
1234
+ using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
1235
952
- Read-only operations such as "git status" that internally refreshes
953
- the index write out the refreshed index to the disk to optimize
954
- future accesses to the working tree, but this could race with a
955
- "read-write" operation that modify the index while it is running.
956
- Detect such a race and avoid overwriting the index.
1236
958
- Duy raised a good point that we may need to do the same for the
959
- normal writeout codepath, not just the "opportunistic" update
960
- codepath. While that is true, nobody sane would be running two
961
- simultaneous operations that are clearly write-oriented competing
962
- with each other against the same index file. So in that sense that
963
- can be done as a less urgent follow-up for this topic.
1237
+* fc/remote-helper-refmap (2014-04-21) 8 commits
1238
+ (merged to 'next' on 2014-04-22 at fb5a4c2)
1239
+ + transport-helper: remove unnecessary strbuf resets
1240
+ + transport-helper: add support to delete branches
1241
+ + fast-export: add support to delete refs
1242
+ + fast-import: add support to delete refs
1243
+ + transport-helper: add support to push symbolic refs
1244
+ + transport-helper: add support for old:new refspec
1245
+ + fast-export: add new --refspec option
1246
+ + fast-export: improve argument parsing
1247
965
- Will keep in 'next' for the remainder of the cycle.
1248
+ Allow remote-helper/fast-import based transport to rename the refs
1249
+ while transferring the history.
1250
1251
968
-* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
969
- - commit -m: commit staged submodules regardless of ignore config
970
- - status/commit: show staged submodules regardless of ignore config
1252
+* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
1253
+ - git-gui: show staged submodules regardless of ignore config
1254
972
- There also are a few patches Ronald Weiss and Jens are working on
973
- polishing around this topic, and a patch from Jens each for gitk
974
- and git-gui.
1255
+ Tentatively queued what I expect to receive via Pat Thoyts.
1256
976
- Waiting for the dust to settle until picking them up all.
1257
1258
+* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
1259
+ - gitk: show staged submodules regardless of ignore config
1260
+ - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
1261
+ - l10n: Init Vietnamese translation
1262
979
-* mh/lockfile (2014-04-15) 25 commits
980
- - trim_last_path_elm(): replace last_path_elm()
981
- - resolve_symlink(): take a strbuf parameter
982
- - resolve_symlink(): use a strbuf for internal scratch space
983
- - change lock_file::filename into a strbuf
984
- - commit_lock_file(): use a strbuf to manage temporary space
985
- - try_merge_strategy(): use a statically-allocated lock_file object
986
- - try_merge_strategy(): remove redundant lock_file allocation
987
- - struct lock_file: declare some fields volatile
988
- - lockfile: avoid transitory invalid states
989
- - commit_lock_file(): die() if called for unlocked lockfile object
990
- - commit_lock_file(): inline temporary variable
991
- - remove_lock_file(): call rollback_lock_file()
992
- - lock_file(): exit early if lockfile cannot be opened
993
- - write_packed_entry_fn(): convert cb_data into a (const int *)
994
- - prepare_index(): declare return value to be (const char *)
995
- - delete_ref_loose(): don't muck around in the lock_file's filename
996
- - cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
997
- - lockfile.c: document the various states of lock_file objects
998
- - lock_file(): always add lock_file object to lock_file_list
999
- - hold_lock_file_for_append(): release lock on errors
1000
- - lockfile: unlock file if lockfile permissions cannot be adjusted
1001
- - rollback_lock_file(): set fd to -1
1002
- - rollback_lock_file(): do not clear filename redundantly
1003
- - api-lockfile: expand the documentation
1004
- - unable_to_lock_die(): rename function from unable_to_lock_index_die()
1263
+ Tentatively queued what I expect to receive via Paul Mackerras.
1264
1006
- Refactor and fix corner-case bugs in the lockfile API, all looked
1007
- sensible.
1265
1009
- Expecting a reroll.
1266
+* jh/submodule-tests (2014-04-17) 1 commit
1267
+ - t7410: 210 tests for various 'git submodule update' scenarios
1268
1269
1270
* mt/patch-id-stable (2014-05-06) 6 commits
@@ -1023,68 +1281,7 @@ of the repositories listed at
1281
Introduce a new way to compute patch-id for a patch that is not
1282
affected by the order of the paths that appear in the input.
1283
1026
- Will keep in 'next' for the remainder of the cycle.
1027
-
1028
-
1029
-* mh/ref-transaction (2014-04-07) 27 commits
1030
- (merged to 'next' on 2014-04-16 at a99f84d)
1031
- + ref_transaction_commit(): work with transaction->updates in place
1032
- + struct ref_update: add a type field
1033
- + struct ref_update: add a lock field
1034
- + ref_transaction_commit(): simplify code using temporary variables
1035
- + struct ref_update: store refname as a FLEX_ARRAY
1036
- + struct ref_update: rename field "ref_name" to "refname"
1037
- + refs: remove API function update_refs()
1038
- + update-ref --stdin: reimplement using reference transactions
1039
- + refs: add a concept of a reference transaction
1040
- + update-ref --stdin: harmonize error messages
1041
- + update-ref --stdin: improve the error message for unexpected EOF
1042
- + t1400: test one mistake at a time
1043
- + update-ref --stdin -z: deprecate interpreting the empty string as zeros
1044
- + update-ref.c: extract a new function, parse_next_sha1()
1045
- + t1400: test that stdin -z update treats empty <newvalue> as zeros
1046
- + update-ref --stdin: simplify error messages for missing oldvalues
1047
- + update-ref --stdin: make error messages more consistent
1048
- + update-ref --stdin: improve error messages for invalid values
1049
- + update-ref.c: extract a new function, parse_refname()
1050
- + parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
1051
- + update-ref --stdin: read the whole input at once
1052
- + update_refs(): fix constness
1053
- + refs.h: rename the action_on_err constants
1054
- + t1400: add some more tests involving quoted arguments
1055
- + parse_arg(): really test that argument is properly terminated
1056
- + t1400: provide more usual input to the command
1057
- + t1400: fix name and expected result of one test
1058
-
1059
- Update "update-ref --stdin [-z]" and then introduce a transactional
1060
- support for (multi-)reference updates.
1061
-
1062
- Will keep in 'next' for the remainder of the cycle.
1063
-
1064
-
1065
-* jc/apply-ignore-whitespace (2014-03-26) 1 commit
1066
- (merged to 'next' on 2014-04-04 at 53779a7)
1067
- + apply --ignore-space-change: lines with and without leading whitespaces do not match
1068
-
1069
- "--ignore-space-change" option of "git apply" ignored the
1070
- spaces at the beginning of line too aggressively, which is
1071
- inconsistent with the option of the same name "diff" and "git diff"
1072
- have.
1073
-
1074
- Will keep in 'next' for the remainder of the cycle.
1075
-
1076
-
1077
-* as/grep-fullname-config (2014-03-20) 1 commit
1078
- (merged to 'next' on 2014-03-28 at 810a076)
1079
- + grep: add grep.fullName config variable
1080
-
1081
- Add a configuration variable to force --full-name to be default for
1082
- "git grep".
1083
-
1084
- This may cause regressions on scripted users that do not expect
1085
- this new behaviour.
1086
-
1087
- Will keep in 'next' for the remainder of the cycle.
1284
+ Will merge to 'master'.
1285
1286
1287
* nd/multiple-work-trees (2014-03-25) 28 commits
@@ -1124,44 +1321,7 @@ of the repositories listed at
1321
Will hold.
1322
1323
1127
-* ks/tree-diff-nway (2014-04-09) 20 commits
1128
- (merged to 'next' on 2014-04-09 at c17228e)
1129
- + mingw: activate alloca
1130
- (merged to 'next' on 2014-04-08 at 6b74773)
1131
- + combine-diff: speed it up, by using multiparent diff tree-walker directly
1132
- + tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
1133
- + Portable alloca for Git
1134
- (merged to 'next' on 2014-03-31 at 16a7bd4)
1135
- + tree-diff: reuse base str(buf) memory on sub-tree recursion
1136
- + tree-diff: no need to call "full" diff_tree_sha1 from show_path()
1137
- + tree-diff: rework diff_tree interface to be sha1 based
1138
- + tree-diff: diff_tree() should now be static
1139
- + tree-diff: remove special-case diff-emitting code for empty-tree cases
1140
- (merged to 'next' on 2014-03-25 at cfcbdac)
1141
- + tree-diff: simplify tree_entry_pathcmp
1142
- + tree-diff: show_path prototype is not needed anymore
1143
- + tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
1144
- + tree-diff: move all action-taking code out of compare_tree_entry()
1145
- + tree-diff: don't assume compare_tree_entry() returns -1,0,1
1146
- (merged to 'next' on 2014-03-21 at d872679)
1147
- + tree-diff: consolidate code for emitting diffs and recursion in one place
1148
- + tree-diff: show_tree() is not needed
1149
- + tree-diff: no need to pass match to skip_uninteresting()
1150
- + tree-diff: no need to manually verify that there is no mode change for a path
1151
- + combine-diff: move changed-paths scanning logic into its own function
1152
- + combine-diff: move show_log_first logic/action out of paths scanning
1153
-
1154
- Instead of running N pair-wise diff-trees when inspecting a
1155
- N-parent merge, find the set of paths that were touched by walking
1156
- N+1 trees in parallel. These set of paths can then be turned into
1157
- N pair-wise diff-tree results to be processed through rename
1158
- detections and such. And N=2 case nicely degenerates to the usual
1159
- 2-way diff-tree, which is very nice.
1160
-
1161
- Will keep in 'next' for the remainder of the cycle.
1162
-
1163
-
1164
-* cc/interpret-trailers (2014-04-29) 11 commits
1324
+* cc/interpret-trailers (2014-05-28) 11 commits
1325
- Documentation: add documentation for 'git interpret-trailers'
1326
- trailer: add tests for commands in config file
1327
- trailer: execute command from 'trailer.<name>.command'
@@ -1191,13 +1351,6 @@ of the repositories listed at
1351
parties.
1352
1353
1194
-* jc/graduate-remote-hg-bzr (2014-05-19) 1 commit
1195
- (merged to 'next' on 2014-05-19 at eeb9af6)
1196
- + remote-helpers: give short instructions to download the latest
1197
-
1198
- Reverted from 'next'.
1199
-
1200
-
1354
* mt/rebase-i-ack (2014-05-19) 6 commits
1355
. git-ack: record an ack
1356
. rebase: test ack
@@ -1210,16 +1363,6 @@ of the repositories listed at
1363
Will be rerolled post 2.0
1364
1365
1213
-* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
1214
- . [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
1215
- . remote-hg: add support for hg v3.0
1216
- . t: remote-hg: trivial cleanups and fixes
1217
- . t: remote-hg: add file operation tests
1218
- . remote-hg: add more tests
1219
-
1220
- No longer relevant, as 'master' unbundles contrib/remote-helpers/.
1221
-
1222
-
1366
* rs/ref-transaction (2014-04-29) 27 commits
1367
. refs.c: make lock_ref_sha1 static
1368
. refs.c: make write_ref_sha1 static
@@ -1254,20 +1397,3 @@ of the repositories listed at
1397
flight, and the topic is still being worked on with frequent
1398
rerolls. Will pick up a reroll once things settle down a bit after
1399
the release.
1257
-
1258
-
1259
-* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
1260
- . remote-hg: trivial cleanups
1261
- . remote-hg: make sure we omit multiple heads
1262
- . git-remote-hg: use internal clone's hgrc
1263
- . t: remote-hg: split into setup test
1264
- . remote-hg: properly detect missing contexts
1265
- . remote-{hg,bzr}: store marks only on success
1266
- . remote-hg: update to 'public' phase when pushing
1267
- . remote-hg: fix parsing of custom committer
1268
- (merged to 'next' on 2014-04-22 at fed170a)
1269
- + remote-helpers: move tests out of contrib
1270
- + remote-helpers: move out of contrib
1271
- + remote-helpers: squelch python import exceptions
1272
-
1273
- No longer relevant, as 'master' unbundles contrib/remote-helpers/.