What's cooking (2015/07 #03)
Junio C Hamano committed
Jul 10, 2015 at 14:43 UTC
3bd1fe637ecba15582188a4144de0cb941a254af
1 file changed
+411
-344
whats-cooking.txt
+411
-344
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2015, #02; Tue, 7)
4
-X-master-at: 5bdb7a78adf2a2656a1915e6fa656aecb45c1fc3
5
-X-next-at: a12d9f81e25048c9843da262f526bf229e6bb487
3
+Subject: What's cooking in git.git (Jul 2015, #03; Fri, 10)
4
+X-master-at: e59f6c2d348d465e3147b11098126d3965686098
5
+X-next-at: 8463c8d6f0c5700d7d5cf215888040724599e56f
6
7
-What's cooking in git.git (Jul 2015, #02; Tue, 7)
7
+What's cooking in git.git (Jul 2015, #03; Fri, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,10 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'.
13
14
As there is at least one new topic in 2.5-rc that has a real and
15
-severe breakage (I haven't merged the fix for it to 'master' yet),
16
-we may probably need to delay the final by at least a few weeks.
15
+severe breakage, we may need to delay the final by at least a few
16
+weeks. Note that when I say "Will merge to 'master'", I am not
17
+saying if that happens before or after the upcoming release, at
18
+least not yet ;-).
19
20
Projects from GSoC students and Ensimag students have also been a
21
pleasure to work with. I'd have to say that this year is much
@@ -25,185 +27,138 @@ of the repositories listed at
27
http://git-blame.blogspot.com/p/git-public-repositories.html
28
29
--------------------------------------------------
28
-[New Topics]
30
+[Graduated to "master"]
31
30
-* es/worktree-add (2015-07-07) 23 commits
31
- - checkout: retire --ignore-other-worktrees in favor of --force
32
- - worktree: add: auto-vivify new branch when <branch> is omitted
33
- - worktree: add: make -b/-B default to HEAD when <branch> is omitted
34
- - worktree: extract basename computation to new function
35
- - checkout: require worktree unconditionally
36
- - checkout: retire --to option
37
- - tests: worktree: retrofit "checkout --to" tests for "worktree add"
38
- - worktree: add -b/-B options
39
- - worktree: add --detach option
40
- - worktree: add --force option
41
- - worktree: introduce "add" command
42
- - checkout: drop 'checkout_opts' dependency from prepare_linked_checkout
43
- - checkout: make --to unconditionally verbose
44
- - checkout: prepare_linked_checkout: drop now-unused 'new' argument
45
- - checkout: relocate --to's "no branch specified" check
46
- - checkout: fix bug with --to and relative HEAD
47
- - Documentation/git-worktree: add EXAMPLES section
48
- - Documentation/git-worktree: add high-level 'lock' overview
49
- - Documentation/git-worktree: split technical info from general description
50
- - Documentation/git-worktree: add BUGS section
51
- - Documentation: move linked worktree description from checkout to worktree
52
- - Documentation/git-worktree: associate options with commands
53
- - Documentation/git-checkout: fix incorrect worktree prune command
54
- (this branch uses nd/multiple-work-trees.)
32
+* cb/rebase-am-exit-code (2015-07-08) 1 commit
33
+ (merged to 'next' on 2015-07-09 at ca9b7e1)
34
+ + rebase: return non-zero error code if format-patch fails
35
56
- Update to the "linked checkout" in 2.5.0-rc1; while I very much
57
- like what I see in this series, I think it does not work well with
58
- the date-based release schedule for v2.5, and as we've been
59
- labelling the feature with "experimental, UI will change" warning,
60
- I am tempted to cook this (or a reroll of it) in 'next' and shoot
61
- for a refined version of it in 2.6, rather than delaying 2.5 final.
36
+ "git rebase" did not exit with failure when format-patch it invoked
37
+ failed for whatever reason.
38
63
- An alternative obviously is to slip 2.5 final for a few weeks,
64
- waiting for this and possibly other hotfix topics to mature.
39
66
- Undecided.
40
+* cb/subtree-tests-update (2015-06-22) 3 commits
41
+ (merged to 'next' on 2015-06-24 at 31a2938)
42
+ + contrib/subtree: small tidy-up to test
43
+ + contrib/subtree: fix broken &&-chains and revealed test error
44
+ + contrib/subtree: use tabs consitently for indentation in tests
45
+
46
+ Tests update in contrib/subtree.
47
48
49
* jc/fix-alloc-sortbuf-in-index-pack (2015-07-04) 1 commit
50
(merged to 'next' on 2015-07-06 at c05da06)
51
+ index-pack: fix allocation of sorted_by_pos array
52
73
- Another hotfix for what is in 2.5-rc but not in 2.4
53
+ A hotfix for what is in 2.5-rc but not in 2.4.
54
75
- The alternative to slip 2.5 final for a few weeks starting to
76
- become more and more attractive...
55
56
+* jk/fix-refresh-utime (2015-07-08) 1 commit
57
+ (merged to 'next' on 2015-07-09 at 323b86d)
58
+ + check_and_freshen_file: fix reversed success-check
59
79
-* jc/unexport-git-pager-in-use-in-pager (2015-07-03) 1 commit
80
- - pager: do not leak "GIT_PAGER_IN_USE" to the pager
60
+ Fix a small bug in our use of umask() return value.
61
82
- When you say "!<ENTER>" while running say "git log", you'd confuse
83
- yourself in the resulting shell, that may look as if you took
84
- control back to the original shell you spawned "git log" from but
85
- that isn't what is happening. To that new shell, we leaked
86
- GIT_PAGER_IN_USE environment variable that was meant as a local
87
- communication between the original "Git" and subprocesses that was
88
- spawned by it after we launched the pager, which caused many
89
- "interesting" things to happen, e.g. "git diff | cat" still paints
90
- its output in color by default.
62
92
- Stop leaking that environment variable to the pager's half of the
93
- fork; we only need it on "Git" side when we spawn the pager.
63
+* jk/maint-for-each-packed-object (2015-06-22) 1 commit
64
+ (merged to 'next' on 2015-06-24 at 162e134)
65
+ + for_each_packed_object: automatically open pack index
66
+ (this branch is used by jk/cat-file-batch-all.)
67
95
- Will merge to 'next'.
68
+ The for_each_packed_object() API function did not iterate over
69
+ objects in a packfile that hasn't been used yet.
70
71
98
-* mh/strbuf-read-file-returns-ssize-t (2015-07-03) 1 commit
99
- - strbuf: strbuf_read_file() should return ssize_t
72
+* jk/pretty-encoding-doc (2015-06-17) 1 commit
73
+ (merged to 'next' on 2015-07-09 at f61edd3)
74
+ + docs: clarify that --encoding can produce invalid sequences
75
+
76
+ Doc update.
77
101
- Will merge to 'next'.
78
+
79
+* jk/rev-list-no-bitmap-while-pruning (2015-07-01) 1 commit
80
+ (merged to 'next' on 2015-07-09 at 81d6d1b)
81
+ + rev-list: disable --use-bitmap-index when pruning commits
82
+
83
+ A minor bugfix when pack bitmap is used with "rev-list --count".
84
+
85
+
86
+* ls/hint-rev-list-count (2015-07-01) 1 commit
87
+ (merged to 'next' on 2015-07-09 at 84139dc)
88
+ + rev-list: add --count to usage guide
89
90
91
* mm/branch-doc-updates (2015-07-06) 2 commits
105
- - Documentation/branch: document -M and -D in terms of --force
106
- - Documentation/branch: document -d --force and -m --force
92
+ (merged to 'next' on 2015-07-09 at 4b0fa63)
93
+ + Documentation/branch: document -M and -D in terms of --force
94
+ + Documentation/branch: document -d --force and -m --force
95
108
- Will merge to 'next'.
96
97
+* nd/dwim-wildcards-as-pathspecs (2015-07-01) 1 commit
98
+ (merged to 'next' on 2015-07-09 at a376360)
99
+ + Add tests for wildcard "path vs ref" disambiguation
100
111
-* pt/am-tests (2015-07-07) 12 commits
112
- - t3901: test git-am encoding conversion
113
- - t3418: non-interactive rebase --continue with rerere enabled
114
- - t4150: tests for am --[no-]scissors
115
- - t4150: am with post-applypatch hook
116
- - t4150: am with pre-applypatch hook
117
- - t4150: am with applypatch-msg hook
118
- - t4150: am --resolved fails if index has unmerged entries
119
- - t4150: am --resolved fails if index has no changes
120
- - t4150: am refuses patches when paused
121
- - t4151: am --abort will keep dirty index intact
122
- - t4150: am fails if index is dirty
123
- - t4150: am.messageid really adds the message id
101
+ Test updates to a topic already in 2.5-rc.
102
125
- Will merge to 'next'.
103
104
+* rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits
105
+ (merged to 'next' on 2015-06-24 at 6af5fa7)
106
+ + test-lib.sh: fix color support when tput needs ~/.terminfo
107
+ + Revert "test-lib.sh: do tests for color support after changing HOME"
108
128
-* kn/for-each-tag-branch (2015-07-07) 11 commits
129
- - for-each-ref: add '--contains' option
130
- - ref-filter: implement '--contains' option
131
- - parse-options.h: add macros for '--contains' option
132
- - parse-option: rename parse_opt_with_commit()
133
- - for-each-ref: add '--merged' and '--no-merged' options
134
- - ref-filter: implement '--merged' and '--no-merged' options
135
- - ref-filter: add parse_opt_merge_filter()
136
- - for-each-ref: add '--points-at' option
137
- - ref-filter: implement '--points-at' option
138
- - tag: libify parse_opt_points_at()
139
- - t6302: for-each-ref tests for ref-filter APIs
140
- (this branch uses kn/for-each-ref.)
109
+ An ancient test framework enhancement to allow color was not
110
+ entirely correct; this makes it work even when tput needs to read
111
+ from the ~/.terminfo under the user's real HOME directory.
112
113
143
-* pt/am-builtin (2015-07-07) 45 commits
144
- - builtin-am: remove redirection to git-am.sh
145
- - builtin-am: check for valid committer ident
146
- - builtin-am: implement legacy -b/--binary option
147
- - builtin-am: implement -i/--interactive
148
- - builtin-am: support and auto-detect mercurial patches
149
- - builtin-am: support and auto-detect StGit series files
150
- - builtin-am: support and auto-detect StGit patches
151
- - builtin-am: rerere support
152
- - builtin-am: invoke post-applypatch hook
153
- - builtin-am: invoke pre-applypatch hook
154
- - builtin-am: invoke applypatch-msg hook
155
- - builtin-am: support automatic notes copying
156
- - builtin-am: invoke post-rewrite hook
157
- - builtin-am: implement -S/--gpg-sign, commit.gpgsign
158
- - builtin-am: implement --committer-date-is-author-date
159
- - builtin-am: implement --ignore-date
160
- - builtin-am: pass git-apply's options to git-apply
161
- - builtin-am: implement --[no-]scissors
162
- - builtin-am: support --keep-cr, am.keepcr
163
- - builtin-am: implement --[no-]message-id, am.messageid
164
- - builtin-am: implement -k/--keep, --keep-non-patch
165
- - builtin-am: implement -u/--utf8
166
- - builtin-am: handle stray state directory
167
- - builtin-am: bypass git-mailinfo when --rebasing
168
- - builtin-am: implement --rebasing mode
169
- - builtin-am: implement --3way, am.threeWay
170
- - cache-tree: introduce write_index_as_tree()
171
- - builtin-am: implement -s/--signoff
172
- - builtin-am: exit with user friendly message on failure
173
- - builtin-am: implement -q/--quiet
174
- - builtin-am: reject patches when there's a session in progress
175
- - builtin-am: implement --abort
176
- - builtin-am: implement --skip
177
- - builtin-am: implement --resolved/--continue
178
- - builtin-am: refuse to apply patches if index is dirty
179
- - builtin-am: implement committing applied patch
180
- - builtin-am: apply patch with git-apply
181
- - builtin-am: extract patch and commit info with git-mailinfo
182
- - builtin-am: auto-detect mbox patches
183
- - builtin-am: split out mbox/maildir patches with git-mailsplit
184
- - builtin-am: implement patch queue mechanism
185
- - builtin-am: implement skeletal builtin am
186
- - wrapper: implement xfopen()
187
- - wrapper: implement xopen()
188
- - Merge branch 'pt/pull-builtin' into pt/am-builtin
189
- (this branch uses pt/pull-builtin.)
114
+* sb/p5310-and-chain (2015-06-26) 1 commit
115
+ (merged to 'next' on 2015-07-09 at c54ee67)
116
+ + p5310: Fix broken && chain in performance test
117
191
- Will merge to 'next'.
118
+ Code clean-up.
119
120
194
-* ad/bisect-cleanup (2015-06-29) 6 commits
195
- - bisect: don't mix option parsing and non-trivial code
196
- - bisect: simplify the addition of new bisect terms
197
- - bisect: replace hardcoded "bad|good" by variables
198
- - Documentation/bisect: revise overall content
199
- - Documentation/bisect: move getting help section to the end
200
- - bisect: correction of typo
201
- (this branch is used by ad/bisect-terms.)
121
+* tb/checkout-doc (2015-06-17) 1 commit
122
+ (merged to 'next' on 2015-07-09 at 74226c9)
123
+ + git-checkout.txt: document "git checkout <pathspec>" better
124
+
125
+ Doc update.
126
+
127
+--------------------------------------------------
128
+[New Topics]
129
+
130
+* dt/log-follow-config (2015-07-09) 1 commit
131
+ (merged to 'next' on 2015-07-10 at b8fbb43)
132
+ + log: add "log.follow" configuration variable
133
+
134
+ Add a new configuration variable to enable "--follow" automatically
135
+ when "git log" is run with one pathspec argument.
136
+
137
+ Will merge to 'master'.
138
203
- Code and documentation clean-up to "git bisect".
139
+
140
+* ss/clone-guess-dir-name-simplify (2015-07-09) 1 commit
141
+ (merged to 'next' on 2015-07-10 at 8a62f4d)
142
+ + clone: simplify string handling in guess_dir_name()
143
+
144
+ Will merge to 'master'.
145
+
146
+
147
+* kn/tag-doc-fix (2015-07-10) 1 commit
148
+ - Documentation/tag: remove double occurance of "<pattern>"
149
150
Will merge to 'next'.
151
152
+
153
+* se/doc-checkout-ours-theirs (2015-07-10) 1 commit
154
+ - checkout: document subtlety around --ours/--theirs
155
+
156
+ A "rebase" replays changes of the local branch on top of something
157
+ else, as such they are placed in stage #3 and referred to as
158
+ "theirs", while the changes in the new base, typically a foreign
159
+ work, are placed in stage #2 and referred to as "ours". Clarify
160
+ the "checkout --ours/--theirs".
161
+
162
--------------------------------------------------
163
[Stalled]
164
@@ -399,56 +354,212 @@ of the repositories listed at
354
--------------------------------------------------
355
[Cooking]
356
402
-* jk/rev-list-no-bitmap-while-pruning (2015-07-01) 1 commit
403
- - rev-list: disable --use-bitmap-index when pruning commits
357
+* es/worktree-add (2015-07-07) 23 commits
358
+ (merged to 'next' on 2015-07-10 at 304e329)
359
+ + checkout: retire --ignore-other-worktrees in favor of --force
360
+ + worktree: add: auto-vivify new branch when <branch> is omitted
361
+ + worktree: add: make -b/-B default to HEAD when <branch> is omitted
362
+ + worktree: extract basename computation to new function
363
+ + checkout: require worktree unconditionally
364
+ + checkout: retire --to option
365
+ + tests: worktree: retrofit "checkout --to" tests for "worktree add"
366
+ + worktree: add -b/-B options
367
+ + worktree: add --detach option
368
+ + worktree: add --force option
369
+ + worktree: introduce "add" command
370
+ + checkout: drop 'checkout_opts' dependency from prepare_linked_checkout
371
+ + checkout: make --to unconditionally verbose
372
+ + checkout: prepare_linked_checkout: drop now-unused 'new' argument
373
+ + checkout: relocate --to's "no branch specified" check
374
+ + checkout: fix bug with --to and relative HEAD
375
+ + Documentation/git-worktree: add EXAMPLES section
376
+ + Documentation/git-worktree: add high-level 'lock' overview
377
+ + Documentation/git-worktree: split technical info from general description
378
+ + Documentation/git-worktree: add BUGS section
379
+ + Documentation: move linked worktree description from checkout to worktree
380
+ + Documentation/git-worktree: associate options with commands
381
+ + Documentation/git-checkout: fix incorrect worktree prune command
382
+ (this branch uses nd/multiple-work-trees.)
383
405
- A minor bugfix when pack bitmap was brought in.
384
+ Update to the "linked checkout" in 2.5.0-rc1.
385
407
- Will merge to 'next'.
386
+ Instead of "checkout --to" that does not do what "checkout"
387
+ normally does, move the functionality to "git worktree add".
388
389
+ Will merge to 'master'.
390
410
-* kb/config-unmap-before-renaming (2015-06-30) 1 commit
411
- - config.c: fix writing config files on Windows network shares
391
413
- Will merge to 'next'.
392
+* jc/unexport-git-pager-in-use-in-pager (2015-07-03) 1 commit
393
+ (merged to 'next' on 2015-07-09 at bff19cd)
394
+ + pager: do not leak "GIT_PAGER_IN_USE" to the pager
395
396
+ When you say "!<ENTER>" while running say "git log", you'd confuse
397
+ yourself in the resulting shell, that may look as if you took
398
+ control back to the original shell you spawned "git log" from but
399
+ that isn't what is happening. To that new shell, we leaked
400
+ GIT_PAGER_IN_USE environment variable that was meant as a local
401
+ communication between the original "Git" and subprocesses that was
402
+ spawned by it after we launched the pager, which caused many
403
+ "interesting" things to happen, e.g. "git diff | cat" still paints
404
+ its output in color by default.
405
416
-* ls/hint-rev-list-count (2015-07-01) 1 commit
417
- - rev-list: add --count to usage guide
406
+ Stop leaking that environment variable to the pager's half of the
407
+ fork; we only need it on "Git" side when we spawn the pager.
408
419
- Will merge to 'next'.
409
+ Will merge to 'master'.
410
411
422
-* mh/fast-import-get-mark (2015-07-01) 1 commit
423
- - fast-import: add a get-mark command
412
+* mh/strbuf-read-file-returns-ssize-t (2015-07-03) 1 commit
413
+ (merged to 'next' on 2015-07-09 at 0d8544e)
414
+ + strbuf: strbuf_read_file() should return ssize_t
415
425
- Will merge to 'next'.
416
+ Avoid possible ssize_t to int truncation.
417
418
+ Will merge to 'master'.
419
428
-* nd/dwim-wildcards-as-pathspecs (2015-07-01) 1 commit
429
- - Add tests for wildcard "path vs ref" disambiguation
420
431
- Will merge to 'next' and then to 'master'.
421
+* pt/am-tests (2015-07-07) 12 commits
422
+ - t3901: test git-am encoding conversion
423
+ - t3418: non-interactive rebase --continue with rerere enabled
424
+ - t4150: tests for am --[no-]scissors
425
+ - t4150: am with post-applypatch hook
426
+ - t4150: am with pre-applypatch hook
427
+ - t4150: am with applypatch-msg hook
428
+ - t4150: am --resolved fails if index has unmerged entries
429
+ - t4150: am --resolved fails if index has no changes
430
+ - t4150: am refuses patches when paused
431
+ - t4151: am --abort will keep dirty index intact
432
+ - t4150: am fails if index is dirty
433
+ - t4150: am.messageid really adds the message id
434
435
+ Sprinkle a few test prereqs ($gmane/273709)?
436
+
437
+ Needs a reroll.
438
+
439
+
440
+* kn/for-each-tag-branch (2015-07-07) 11 commits
441
+ - for-each-ref: add '--contains' option
442
+ - ref-filter: implement '--contains' option
443
+ - parse-options.h: add macros for '--contains' option
444
+ - parse-option: rename parse_opt_with_commit()
445
+ - for-each-ref: add '--merged' and '--no-merged' options
446
+ - ref-filter: implement '--merged' and '--no-merged' options
447
+ - ref-filter: add parse_opt_merge_filter()
448
+ - for-each-ref: add '--points-at' option
449
+ - ref-filter: implement '--points-at' option
450
+ - tag: libify parse_opt_points_at()
451
+ - t6302: for-each-ref tests for ref-filter APIs
452
+ (this branch uses kn/for-each-ref.)
453
+
454
+ Sprinkle a few test prereqs ($gmane/273652)?
455
+
456
+ Needs a reroll.
457
434
-* kb/i18n-doc (2015-07-01) 1 commit
435
- - Documentation/i18n.txt: clarify character encoding support
458
+
459
+* pt/am-builtin (2015-07-08) 47 commits
460
+ - builtin-am: remove redirection to git-am.sh
461
+ - builtin-am: check for valid committer ident
462
+ - builtin-am: implement legacy -b/--binary option
463
+ - builtin-am: implement -i/--interactive
464
+ - builtin-am: support and auto-detect mercurial patches
465
+ - builtin-am: support and auto-detect StGit series files
466
+ - builtin-am: support and auto-detect StGit patches
467
+ - builtin-am: rerere support
468
+ - builtin-am: invoke post-applypatch hook
469
+ - builtin-am: invoke pre-applypatch hook
470
+ - builtin-am: invoke applypatch-msg hook
471
+ - builtin-am: support automatic notes copying
472
+ - builtin-am: invoke post-rewrite hook
473
+ - builtin-am: implement -S/--gpg-sign, commit.gpgsign
474
+ - builtin-am: implement --committer-date-is-author-date
475
+ - builtin-am: implement --ignore-date
476
+ - builtin-am: pass git-apply's options to git-apply
477
+ - builtin-am: implement --[no-]scissors
478
+ - builtin-am: support --keep-cr, am.keepcr
479
+ - builtin-am: implement --[no-]message-id, am.messageid
480
+ - builtin-am: implement -k/--keep, --keep-non-patch
481
+ - builtin-am: implement -u/--utf8
482
+ - builtin-am: handle stray state directory
483
+ - fixup! builtin-am: bypass git-mailinfo when --rebasing
484
+ - builtin-am: bypass git-mailinfo when --rebasing
485
+ - builtin-am: implement --rebasing mode
486
+ - builtin-am: implement --3way, am.threeWay
487
+ - cache-tree: introduce write_index_as_tree()
488
+ - builtin-am: implement -s/--signoff
489
+ - builtin-am: exit with user friendly message on failure
490
+ - builtin-am: implement -q/--quiet
491
+ - builtin-am: reject patches when there's a session in progress
492
+ - builtin-am: implement --abort
493
+ - builtin-am: implement --skip
494
+ - builtin-am: implement --resolved/--continue
495
+ - builtin-am: refuse to apply patches if index is dirty
496
+ - builtin-am: implement committing applied patch
497
+ - builtin-am: apply patch with git-apply
498
+ - fixup! builtin-am: extract patch and commit info with git-mailinfo
499
+ - builtin-am: extract patch and commit info with git-mailinfo
500
+ - builtin-am: auto-detect mbox patches
501
+ - builtin-am: split out mbox/maildir patches with git-mailsplit
502
+ - builtin-am: implement patch queue mechanism
503
+ - builtin-am: implement skeletal builtin am
504
+ - wrapper: implement xfopen()
505
+ - wrapper: implement xopen()
506
+ - Merge branch 'pt/pull-builtin' into pt/am-builtin
507
+ (this branch uses pt/pull-builtin.)
508
+
509
+ Rewrite "am" in "C".
510
+
511
+ Looks more-or-less ready. Any reroll needed other than squashing
512
+ these fixup! in?
513
+
514
+
515
+* ad/bisect-cleanup (2015-06-29) 6 commits
516
+ (merged to 'next' on 2015-07-09 at 75e2a06)
517
+ + bisect: don't mix option parsing and non-trivial code
518
+ + bisect: simplify the addition of new bisect terms
519
+ + bisect: replace hardcoded "bad|good" by variables
520
+ + Documentation/bisect: revise overall content
521
+ + Documentation/bisect: move getting help section to the end
522
+ + bisect: correction of typo
523
+ (this branch is used by ad/bisect-terms.)
524
+
525
+ Code and documentation clean-up to "git bisect".
526
+
527
+ Will merge to 'master'.
528
+
529
+
530
+* kb/config-unmap-before-renaming (2015-06-30) 1 commit
531
+ (merged to 'next' on 2015-07-10 at 6b89478)
532
+ + config.c: fix writing config files on Windows network shares
533
+
534
+ Will merge to 'master'.
535
+
536
+
537
+* mh/fast-import-get-mark (2015-07-01) 1 commit
538
+ - fast-import: add a get-mark command
539
540
Will merge to 'next'.
541
542
543
+* kb/i18n-doc (2015-07-01) 1 commit
544
+ (merged to 'next' on 2015-07-09 at a12c7b3)
545
+ + Documentation/i18n.txt: clarify character encoding support
546
+
547
+ Will merge to 'master'.
548
+
549
+
550
* kb/use-nsec-doc (2015-07-01) 1 commit
441
- - Makefile / racy-git.txt: clarify USE_NSEC prerequisites
551
+ (merged to 'next' on 2015-07-09 at e7e5a05)
552
+ + Makefile / racy-git.txt: clarify USE_NSEC prerequisites
553
443
- Will merge to 'next'.
554
+ Will merge to 'master'.
555
556
446
-* dt/refs-backend-preamble (2015-06-30) 8 commits
447
- - git-stash: use git-reflog instead of creating files
448
- - SQUASH???
449
- - git-reflog: add create and exists functions
557
+* dt/refs-backend-preamble (2015-07-08) 8 commits
558
+ - git-stash: use update-ref --create-reflog instead of creating files
559
+ - update-ref and tag: add --create-reflog arg
560
+ - git-reflog: add exists command
561
- refs: new public ref function: safe_create_reflog
451
- - refs: break out check for reflog autocreation
562
+ - refs: Break out check for reflog autocreation
563
- bisect: treat BISECT_HEAD as a ref
564
- cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
565
- refs.c: add err arguments to reflog functions
@@ -459,11 +570,14 @@ of the repositories listed at
570
direct filesystem access to ref-like things like CHERRY_PICK_HEAD
571
from scripts and programs.
572
462
- Will merge to 'next' after squashing the fix in.
573
+ Still under discussion.
574
+
575
+ Will hold.
576
577
578
* et/http-proxyauth (2015-06-29) 1 commit
466
- - http: always use any proxy auth method available
579
+ (merged to 'next' on 2015-07-09 at cf80874)
580
+ + http: always use any proxy auth method available
581
582
We used to ask libCURL to use the most secure authentication method
583
available when talking to an HTTP proxy only when we were told to
@@ -472,56 +586,51 @@ of the repositories listed at
586
can tell libCURL to use an HTTP proxy via an environment variable
587
without using configuration variables.
588
475
- Looked sensible. An extra set of eyes appreciated, but I think
476
- this is ready.
589
+ An extra set of eyes appreciated, but I think this is ready.
590
478
- Will merge to 'next'.
591
+ Will merge to 'master'.
592
593
594
* jc/fsck-retire-require-eoh (2015-06-28) 1 commit
482
- - fsck: it is OK for a tag and a commit to lack the body
595
+ (merged to 'next' on 2015-07-09 at dbc292b)
596
+ + fsck: it is OK for a tag and a commit to lack the body
597
598
A fix to a minor regression to "git fsck" in v2.2 era that started
599
complaining about a body-less tag object when it lacks a separator
600
empty line after its header to separate it with a non-existent body.
601
488
- Will merge to 'next'.
602
+ Will merge to 'master'.
603
604
605
* jk/date-mode-format (2015-06-29) 3 commits
492
- - introduce "format" date-mode
493
- - convert "enum date_mode" into a struct
494
- - show-branch: use DATE_RELATIVE instead of magic number
606
+ (merged to 'next' on 2015-07-09 at a01bfc3)
607
+ + introduce "format" date-mode
608
+ + convert "enum date_mode" into a struct
609
+ + show-branch: use DATE_RELATIVE instead of magic number
610
611
Teach "git log" and friends a new "--date=format:..." option to
612
format timestamps using system's strftime(3).
613
499
- Will merge to 'next'.
614
+ Will merge to 'master'.
615
616
617
* jk/still-interesting (2015-06-29) 1 commit
503
- - revision.c: remove unneeded check for NULL
618
+ (merged to 'next' on 2015-07-09 at e19fc0e)
619
+ + revision.c: remove unneeded check for NULL
620
621
Code clean-up.
622
507
- Will merge to 'next'.
623
+ Will merge to 'master'.
624
625
626
* nd/export-worktree (2015-06-26) 1 commit
511
- - setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
627
+ (merged to 'next' on 2015-07-09 at 1581a9b)
628
+ + setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
629
630
Running an aliased command from a subdirectory when the .git thing
631
in the working tree is a gitfile pointing elsewhere did not work.
632
516
- Will merge to 'next'.
517
-
518
-
519
-* sb/p5310-and-chain (2015-06-26) 1 commit
520
- - p5310: Fix broken && chain in performance test
521
-
522
- Code clean-up.
523
-
524
- Will merge to 'next'.
633
+ Will merge to 'master'.
634
635
636
* jc/rerere (2015-07-06) 19 commits
@@ -565,6 +674,8 @@ of the repositories listed at
674
certain attractiveness ($gname/272867), and makes some of the work
675
on this topic a moot point.
676
677
+ Will hold.
678
+
679
680
* mh/tempfile (2015-06-10) 14 commits
681
- credential-cache--daemon: use tempfile module
@@ -591,71 +702,45 @@ of the repositories listed at
702
703
704
* js/fsck-opt (2015-06-23) 19 commits
594
- - fsck: support ignoring objects in `git fsck` via fsck.skiplist
595
- - fsck: git receive-pack: support excluding objects from fsck'ing
596
- - fsck: introduce `git fsck --connectivity-only`
597
- - fsck: support demoting errors to warnings
598
- - fsck: document the new receive.fsck.<msg-id> options
599
- - fsck: allow upgrading fsck warnings to errors
600
- - fsck: optionally ignore specific fsck issues completely
601
- - fsck: disallow demoting grave fsck errors to warnings
602
- - fsck: add a simple test for receive.fsck.<msg-id>
603
- - fsck: make fsck_tag() warn-friendly
604
- - fsck: handle multiple authors in commits specially
605
- - fsck: make fsck_commit() warn-friendly
606
- - fsck: make fsck_ident() warn-friendly
607
- - fsck: report the ID of the error/warning
608
- - fsck (receive-pack): allow demoting errors to warnings
609
- - fsck: offer a function to demote fsck errors to warnings
610
- - fsck: provide a function to parse fsck message IDs
611
- - fsck: introduce identifiers for fsck messages
612
- - fsck: introduce fsck options
705
+ (merged to 'next' on 2015-07-10 at eb4da0a)
706
+ + fsck: support ignoring objects in `git fsck` via fsck.skiplist
707
+ + fsck: git receive-pack: support excluding objects from fsck'ing
708
+ + fsck: introduce `git fsck --connectivity-only`
709
+ + fsck: support demoting errors to warnings
710
+ + fsck: document the new receive.fsck.<msg-id> options
711
+ + fsck: allow upgrading fsck warnings to errors
712
+ + fsck: optionally ignore specific fsck issues completely
713
+ + fsck: disallow demoting grave fsck errors to warnings
714
+ + fsck: add a simple test for receive.fsck.<msg-id>
715
+ + fsck: make fsck_tag() warn-friendly
716
+ + fsck: handle multiple authors in commits specially
717
+ + fsck: make fsck_commit() warn-friendly
718
+ + fsck: make fsck_ident() warn-friendly
719
+ + fsck: report the ID of the error/warning
720
+ + fsck (receive-pack): allow demoting errors to warnings
721
+ + fsck: offer a function to demote fsck errors to warnings
722
+ + fsck: provide a function to parse fsck message IDs
723
+ + fsck: introduce identifiers for fsck messages
724
+ + fsck: introduce fsck options
725
726
Allow ignoring fsck errors on specific set of known-to-be-bad
727
objects, and also tweaking warning level of various kinds of non
728
critical breakages reported.
729
618
- Will merge to 'next'.
730
+ Will merge to 'master'.
731
732
733
* js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits
622
- - rebase -i: do not leave a CHERRY_PICK_HEAD file behind
623
- - t3404: demonstrate CHERRY_PICK_HEAD bug
734
+ (merged to 'next' on 2015-07-09 at b844d9a)
735
+ + rebase -i: do not leave a CHERRY_PICK_HEAD file behind
736
+ + t3404: demonstrate CHERRY_PICK_HEAD bug
737
738
Abandoning an already applied change in "git rebase -i" with
739
"--continue" left CHERRY_PICK_HEAD and confused later steps.
740
628
- Will merge to 'next'.
629
-
630
-
631
-* rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits
632
- (merged to 'next' on 2015-06-24 at 6af5fa7)
633
- + test-lib.sh: fix color support when tput needs ~/.terminfo
634
- + Revert "test-lib.sh: do tests for color support after changing HOME"
635
-
636
- An ancient test framework enhancement to allow color was not
637
- entirely correct; this makes it work even when tput needs to read
638
- from the ~/.terminfo under the user's real HOME directory.
639
-
741
Will merge to 'master'.
742
743
643
-* tb/checkout-doc (2015-06-17) 1 commit
644
- - git-checkout.txt: document "git checkout <pathspec>" better
645
-
646
- Doc update.
647
-
648
- Will merge to 'next'.
649
-
650
-
651
-* jk/pretty-encoding-doc (2015-06-17) 1 commit
652
- - docs: clarify that --encoding can produce invalid sequences
653
-
654
- Doc update.
655
-
656
- Will merge to 'next'.
657
-
658
-
744
* ak/format-patch-odir-config (2015-06-19) 1 commit
745
- format-patch: introduce format.outputDirectory configuration
746
@@ -695,55 +780,34 @@ of the repositories listed at
780
Will merge to 'master'.
781
782
698
-* cb/subtree-tests-update (2015-06-22) 3 commits
699
- (merged to 'next' on 2015-06-24 at 31a2938)
700
- + contrib/subtree: small tidy-up to test
701
- + contrib/subtree: fix broken &&-chains and revealed test error
702
- + contrib/subtree: use tabs consitently for indentation in tests
703
-
704
- Tests update in contrib/subtree.
705
-
706
- Will merge to 'master'.
707
-
708
-
783
* jk/cat-file-batch-all (2015-06-26) 8 commits
710
- - cat-file: sort and de-dup output of --batch-all-objects
711
- - cat-file: add --batch-all-objects option
712
- - cat-file: split batch_one_object into two stages
713
- - cat-file: stop returning value from batch_one_object
714
- - cat-file: add --buffer option
715
- - cat-file: move batch_options definition to top of file
716
- - cat-file: minor style fix in options list
717
- - Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all
718
- (this branch uses jk/maint-for-each-packed-object.)
784
+ (merged to 'next' on 2015-07-10 at 80200cc)
785
+ + cat-file: sort and de-dup output of --batch-all-objects
786
+ + cat-file: add --batch-all-objects option
787
+ + cat-file: split batch_one_object into two stages
788
+ + cat-file: stop returning value from batch_one_object
789
+ + cat-file: add --buffer option
790
+ + cat-file: move batch_options definition to top of file
791
+ + cat-file: minor style fix in options list
792
+ + Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all
793
794
"cat-file" learned "--batch-all-objects" option to enumerate all
795
available objects in the repository more quickly than "rev-list
796
--all --objects" (the output includes unreachable objects, though).
797
724
- Will merge to 'next'.
725
-
726
-
727
-* jk/maint-for-each-packed-object (2015-06-22) 1 commit
728
- (merged to 'next' on 2015-06-24 at 162e134)
729
- + for_each_packed_object: automatically open pack index
730
- (this branch is used by jk/cat-file-batch-all.)
731
-
732
- The for_each_packed_object() API function did not iterate over
733
- objects in a packfile that hasn't been used yet.
734
-
798
Will merge to 'master'.
799
800
801
* jk/pkt-log-pack (2015-06-16) 3 commits
739
- - pkt-line: support tracing verbatim pack contents
740
- - pkt-line: tighten sideband PACK check when tracing
741
- - pkt-line: simplify starts_with checks in packet tracing
802
+ (merged to 'next' on 2015-07-10 at ba33212)
803
+ + pkt-line: support tracing verbatim pack contents
804
+ + pkt-line: tighten sideband PACK check when tracing
805
+ + pkt-line: simplify starts_with checks in packet tracing
806
807
Enhance packet tracing machinery to allow capturing an incoming
808
pack data to a file for debugging.
809
746
- Will merge to 'next'.
810
+ Will merge to 'master'.
811
812
813
* kn/for-each-ref (2015-06-15) 11 commits
@@ -764,32 +828,35 @@ of the repositories listed at
828
GSoC project to rebuild ref listing by branch and tag based on the
829
for-each-ref machinery. This is its first part.
830
831
+ Will merge to 'master'.
832
+
833
834
* mh/init-delete-refs-api (2015-06-22) 19 commits
769
- - delete_ref(): use the usual convention for old_sha1
770
- - cmd_update_ref(): make logic more straightforward
771
- - update_ref(): don't read old reference value before delete
772
- - check_branch_commit(): make first parameter const
773
- - refs.h: add some parameter names to function declarations
774
- - refs: move the remaining ref module declarations to refs.h
775
- - initial_ref_transaction_commit(): check for ref D/F conflicts
776
- - initial_ref_transaction_commit(): check for duplicate refs
777
- - refs: remove some functions from the module's public interface
778
- - initial_ref_transaction_commit(): function for initial ref creation
779
- - repack_without_refs(): make function private
780
- - prune_refs(): use delete_refs()
781
- - prune_remote(): use delete_refs()
782
- - delete_refs(): bail early if the packed-refs file cannot be rewritten
783
- - delete_refs(): make error message more generic
784
- - delete_refs(): new function for the refs API
785
- - delete_ref(): handle special case more explicitly
786
- - remove_branches(): remove temporary
787
- - delete_ref(): move declaration to refs.h
835
+ (merged to 'next' on 2015-07-10 at 121b26e)
836
+ + delete_ref(): use the usual convention for old_sha1
837
+ + cmd_update_ref(): make logic more straightforward
838
+ + update_ref(): don't read old reference value before delete
839
+ + check_branch_commit(): make first parameter const
840
+ + refs.h: add some parameter names to function declarations
841
+ + refs: move the remaining ref module declarations to refs.h
842
+ + initial_ref_transaction_commit(): check for ref D/F conflicts
843
+ + initial_ref_transaction_commit(): check for duplicate refs
844
+ + refs: remove some functions from the module's public interface
845
+ + initial_ref_transaction_commit(): function for initial ref creation
846
+ + repack_without_refs(): make function private
847
+ + prune_refs(): use delete_refs()
848
+ + prune_remote(): use delete_refs()
849
+ + delete_refs(): bail early if the packed-refs file cannot be rewritten
850
+ + delete_refs(): make error message more generic
851
+ + delete_refs(): new function for the refs API
852
+ + delete_ref(): handle special case more explicitly
853
+ + remove_branches(): remove temporary
854
+ + delete_ref(): move declaration to refs.h
855
856
Clean up refs API and make "git clone" less intimate with the
857
implementation detail.
858
792
- Will merge to 'next'.
859
+ Will merge to 'master'.
860
861
862
* mh/replace-refs (2015-06-12) 1 commit
@@ -813,17 +880,16 @@ of the repositories listed at
880
881
882
* gp/status-rebase-i-info (2015-07-06) 4 commits
816
- - status: add new tests for status during rebase -i
817
- - status: give more information during rebase -i
818
- - status: differentiate interactive from non-interactive rebases
819
- - status: factor two rebase-related messages together
883
+ (merged to 'next' on 2015-07-10 at b121298)
884
+ + status: add new tests for status during rebase -i
885
+ + status: give more information during rebase -i
886
+ + status: differentiate interactive from non-interactive rebases
887
+ + status: factor two rebase-related messages together
888
889
Teach "git status" to show a more detailed information regarding
890
the "rebase -i" session in progress.
891
824
- Looks ready for 'next'. I however wonder if there is a negative
825
- interaction with 16cf51c7 (git-rebase--interactive.sh: add config
826
- option for custom instruction format, 2015-06-13)?
892
+ Will merge to 'master'.
893
894
895
* mk/utf8-no-iconv-warn (2015-06-08) 1 commit
@@ -839,11 +905,12 @@ of the repositories listed at
905
906
907
* mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit
842
- - git-rebase--interactive.sh: add config option for custom instruction format
908
+ (merged to 'next' on 2015-07-10 at ec383cd)
909
+ + git-rebase--interactive.sh: add config option for custom instruction format
910
911
"git rebase -i"'s list of todo is made configurable.
912
846
- Will merge to 'next'.
913
+ Will merge to 'master'.
914
915
916
* pt/am-foreign (2015-06-15) 5 commits
@@ -859,43 +926,45 @@ of the repositories listed at
926
927
928
* pt/pull-builtin (2015-06-18) 19 commits
862
- - pull: remove redirection to git-pull.sh
863
- - pull --rebase: error on no merge candidate cases
864
- - pull --rebase: exit early when the working directory is dirty
865
- - pull: configure --rebase via branch.<name>.rebase or pull.rebase
866
- - pull: teach git pull about --rebase
867
- - pull: set reflog message
868
- - pull: implement pulling into an unborn branch
869
- - pull: fast-forward working tree if head is updated
870
- - pull: check if in unresolved merge state
871
- - pull: support pull.ff config
872
- - pull: error on no merge candidates
873
- - pull: pass git-fetch's options to git-fetch
874
- - pull: pass git-merge's options to git-merge
875
- - pull: pass verbosity, --progress flags to fetch and merge
876
- - pull: implement fetch + merge
877
- - pull: implement skeletal builtin pull
878
- - argv-array: implement argv_array_pushv()
879
- - parse-options-cb: implement parse_opt_passthru_argv()
880
- - parse-options-cb: implement parse_opt_passthru()
929
+ (merged to 'next' on 2015-07-10 at 07b1794)
930
+ + pull: remove redirection to git-pull.sh
931
+ + pull --rebase: error on no merge candidate cases
932
+ + pull --rebase: exit early when the working directory is dirty
933
+ + pull: configure --rebase via branch.<name>.rebase or pull.rebase
934
+ + pull: teach git pull about --rebase
935
+ + pull: set reflog message
936
+ + pull: implement pulling into an unborn branch
937
+ + pull: fast-forward working tree if head is updated
938
+ + pull: check if in unresolved merge state
939
+ + pull: support pull.ff config
940
+ + pull: error on no merge candidates
941
+ + pull: pass git-fetch's options to git-fetch
942
+ + pull: pass git-merge's options to git-merge
943
+ + pull: pass verbosity, --progress flags to fetch and merge
944
+ + pull: implement fetch + merge
945
+ + pull: implement skeletal builtin pull
946
+ + argv-array: implement argv_array_pushv()
947
+ + parse-options-cb: implement parse_opt_passthru_argv()
948
+ + parse-options-cb: implement parse_opt_passthru()
949
(this branch is used by pt/am-builtin.)
950
951
Reimplement 'git pull' in C.
952
885
- Will merge to 'next'.
953
+ Will merge to 'master'.
954
955
956
* rl/send-email-aliases (2015-07-07) 10 commits
889
- - send-email: suppress meaningless whitespaces in from field
890
- - send-email: allow multiple emails using --cc, --to and --bcc
891
- - send-email: consider quote as delimiter instead of character
892
- - send-email: reduce dependencies impact on parse_address_line
893
- - send-email: minor code refactoring
894
- - send-email: allow use of aliases in the From field of --compose mode
895
- - send-email: refactor address list process
896
- - t9001-send-email: refactor header variable fields replacement
897
- - send-email: allow aliases in patch header and command script outputs
898
- - t9001-send-email: move script creation in a setup test
957
+ (merged to 'next' on 2015-07-09 at c60553d)
958
+ + send-email: suppress meaningless whitespaces in from field
959
+ + send-email: allow multiple emails using --cc, --to and --bcc
960
+ + send-email: consider quote as delimiter instead of character
961
+ + send-email: reduce dependencies impact on parse_address_line
962
+ + send-email: minor code refactoring
963
+ + send-email: allow use of aliases in the From field of --compose mode
964
+ + send-email: refactor address list process
965
+ + t9001-send-email: refactor header variable fields replacement
966
+ + send-email: allow aliases in patch header and command script outputs
967
+ + t9001-send-email: move script creation in a setup test
968
969
"git send-email" now performs alias-expansion on names that are
970
given via --cccmd, etc.
@@ -904,7 +973,7 @@ of the repositories listed at
973
which makes it a bit scary, but as long as it works as designed, it
974
makes it wonderful ;-).
975
907
- Will merge to 'next'.
976
+ Will merge to 'master'.
977
978
979
* wp/sha1-name-negative-match (2015-06-08) 2 commits
@@ -985,9 +1054,7 @@ of the repositories listed at
1054
The gitmodules API accessed from the C code learned to cache stuff
1055
lazily.
1056
988
- Looked reasonable from a cursory read.
989
-
990
- Will merge to 'next'.
1057
+ Needs another reroll? ($gmane/273743).
1058
1059
1060
* jc/push-tags-also (2015-05-29) 1 commit