What's cooking (2016/10 #06)
Junio C Hamano committed
Oct 24, 2016 at 18:07 UTC
9e218500c23541b8abbc0f1e753f1f9016745088
1 file changed
+283
-107
whats-cooking.txt
+283
-107
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2016, #05; Thu, 20)
3
+Subject: What's cooking in git.git (Oct 2016, #06; Mon, 24)
4
X-master-at: 659889482ac63411daea38b2c3d127842ea04e4d
5
-X-next-at: ffd0de042c0ecacbb6661b2f7becf79fe3cf1d4b
5
+X-next-at: 5073a4de2dac30ca7cfaaa2d4bdd8eead108e4ca
6
7
-What's cooking in git.git (Oct 2016, #05; Thu, 20)
7
+What's cooking in git.git (Oct 2016, #06; Mon, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,57 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
+Originally I planed to start concluding this cycle today, but
16
+waiting for the conclusion of a few test breakages on Windows, I
17
+didn't tag -rc0 today.
18
+
19
+Here are my current thinking on the notable topics.
20
+
21
+ - the "off-by-one fix" part of sb/submodule-ignore-trailing-slash
22
+ needs to be in the upcoming release but the "trailing /. in base
23
+ should not affect the resolution of ../relative/path" part that
24
+ is still under discussion can wait. Which means we'd need a few
25
+ more !MINGW prerequisites in the tests by -rc0.
26
+
27
+ - js/prepare-sequencer topic is not yet in 'next' but it would be a
28
+ nice-to-have in the upcoming release if we can. It does not yet
29
+ touch "rebase -i", but does touch the sequencer code that is used
30
+ in cherry-pick and revert, so I'd prefer to cook it for at least
31
+ a week and half in 'next' before merging.
32
+
33
+ - ls/filter-process topic has been in 'next' with one known test
34
+ breakage on Windows, whose resolution ls/git-open-cloexec is
35
+ close to its final shape. Perhaps we can cook them for at least
36
+ a week and half in 'next' and have it in the upcoming release.
37
+
38
+ - ex/deprecate-empty-pathspec-as-match-all topic that makes it
39
+ illegal to say 'git add ""' when you mean 'git add .' has been in
40
+ 'next' for more than a cycle. I am inclined to merge it in the
41
+ upcoming release.
42
+
43
+ - jc/merge-drop-old-syntax is relatively new in 'next' after all
44
+ known in-tree dependents have been updated. I am planning to
45
+ keep it cooking in 'next' but add a backward incompatibility
46
+ notice to the release notes to the upcoming release.
47
+
48
+ - lt/abbrev-auto and its follow-up jk/abbrev-auto are about auto
49
+ scaling the default abbreviation length when Git produces a short
50
+ object name to adjust to the modern times. Peff noticed one
51
+ fallout from it recently and its fix jc/abbrev-auto is not yet in
52
+ 'next'. I would not be surprised if there are other uncovered
53
+ fallouts remaining in the code, but at the same time, I expect
54
+ they are all cosmetic kind that do not affect correctness, so I
55
+ am inclined to include all of them in the upcoming release.
56
+
57
+I plan to merge other smallish topics that have been in 'next' to
58
+'master' soonish, and relabel the remainder that have been labeled
59
+as "Will merge to 'master'" to "Will hold" and keep cooking them in
60
+'next'. For this reason, please do not take the "Will merge to
61
+'master'" label too literally in this issue of "What's cooking"
62
+report. It is always true that the label only means "the topic will
63
+be in 'master' eventually", not "the topic will be in the upcoming
64
+release", but in this issue that is even more true than usual.
65
+
66
You can find the changes described here in the integration branches
67
of the repositories listed at
68
@@ -20,117 +71,107 @@ of the repositories listed at
71
--------------------------------------------------
72
[New Topics]
73
23
-* jc/merge-base-fp-only (2016-10-19) 8 commits
24
- . merge-base: fp experiment
25
- - merge: allow to use only the fp-only merge bases
26
- - merge-base: limit the output to bases that are on first-parent chain
27
- - merge-base: mark bases that are on first-parent chain
28
- - merge-base: expose get_merge_bases_many_0() a bit more
29
- - merge-base: stop moving commits around in remove_redundant()
30
- - sha1_name: remove ONELINE_SEEN bit
31
- - commit: simplify fastpath of merge-base
74
+* jk/tap-verbose-fix (2016-10-24) 4 commits
75
+ (merged to 'next' on 2016-10-24 at 5073a4de2d)
76
+ + test-lib: bail out when "-v" used under "prove"
77
+ (merged to 'next' on 2016-10-21 at 592679411c)
78
+ + travis: use --verbose-log test option
79
+ + test-lib: add --verbose-log option
80
+ + test-lib: handle TEST_OUTPUT_DIRECTORY with spaces
81
+
82
+ The Travis CI configuration we ship ran the tests with --verbose
83
+ option but this risks non-TAP output that happens to be "ok" to be
84
+ misinterpreted as TAP signalling a test that passed. This resulted
85
+ in unnecessary failure. This has been corrected by introducing a
86
+ new mode to run our tests in the test harness to send the verbose
87
+ output separately to the log file.
88
33
- An experiment of merge-base that ignores common ancestors that are
34
- not on the first parent chain.
89
+ Will merge to 'master'.
90
91
37
-* bw/submodule-branch-dot-doc (2016-10-19) 1 commit
38
- - submodules doc: update documentation for "." used for submodule branches
92
+* po/fix-doc-merge-base-illustration (2016-10-21) 1 commit
93
+ (merged to 'next' on 2016-10-21 at ac6f04a6c5)
94
+ + doc: fix merge-base ASCII art tab spacing
95
40
- Recent git allows submodule.<name>.branch to use a special token
41
- "." instead of the branch name; the documentation has been updated
42
- to describe it.
96
+ Some AsciiDoc formatter mishandles a displayed illustration with
97
+ tabs in it. Adjust a few of them in merge-base documentation to
98
+ work around them.
99
44
- Will merge to 'next'.
100
+ Will merge to 'master'.
101
102
47
-* tg/add-chmod+x-fix (2016-10-20) 1 commit
48
- - t3700: fix broken test under !SANITY
103
+* jc/abbrev-auto (2016-10-22) 4 commits
104
+ - transport: compute summary-width dynamically
105
+ - transport: allow summary-width to be computed dynamically
106
+ - fetch: pass summary_width down the callchain
107
+ - transport: pass summary_width down the callchain
108
+ (this branch uses jk/abbrev-auto and lt/abbrev-auto.)
109
50
- A hot-fix for a test added by a recent topic that went to both
51
- 'master' and 'maint' already.
110
+ "git push" and "git fetch" reports from what old object to what new
111
+ object each ref was updated, using abbreviated refnames, and they
112
+ attempt to align the columns for this and other pieces of
113
+ information. The way these codepaths compute how many display
114
+ columns to allocate for the object names portion of this output has
115
+ been updated to match the recent "auto scale the default
116
+ abbreviation length" change.
117
118
Will merge to 'next'.
119
120
56
-* jk/diff-submodule-diff-inline (2016-10-20) 1 commit
57
- - rev-list: use hdr_termination instead of a always using a newline
121
+* jc/reset-unmerge (2016-10-24) 1 commit
122
+ - reset: --unmerge
123
59
- A recently graduated topic regressed "git rev-list --header"
60
- output, breaking "gitweb". This has been fixed.
124
+ After "git add" is run prematurely during a conflict resolution,
125
+ "git diff" can no longer be used as a way to sanity check by
126
+ looking at the combined diff. "git reset" learned a new
127
+ "--unmerge" option to recover from this situation.
128
62
- Will merge to 'next'.
129
130
65
-* jk/no-looking-at-dotgit-outside-repo (2016-10-20) 8 commits
66
- - setup_git_env: avoid blind fall-back to ".git"
67
- - diff: handle sha1 abbreviations outside of repository
68
- - diff_aligned_abbrev: use "struct oid"
69
- - diff_unique_abbrev: rename to diff_aligned_abbrev
70
- - find_unique_abbrev: use 4-buffer ring
71
- - test-*-cache-tree: setup git dir
72
- - read info/{attributes,exclude} only when in repository
73
- - Merge branch 'jc/diff-unique-abbrev-comments' into jk/no-looking-at-dotgit-outside-repo
74
- (this branch uses jc/diff-unique-abbrev-comments.)
131
+* jk/daemon-path-ok-check-truncation (2016-10-24) 1 commit
132
+ - daemon: detect and reject too-long paths
133
76
- Update "git diff --no-index" codepath not to try to peek into .git/
77
- directory that happens to be under the current directory, when we
78
- know we are operating outside any repository.
134
+ "git daemon" used fixed-length buffers to turn URL to the
135
+ repository the client asked for into the server side directory
136
+ path, using snprintf() to avoid overflowing these buffers, but
137
+ allowed possibly truncated paths to the directory. This has been
138
+ tightened to reject such a request that causes overlong path to be
139
+ required to serve.
140
80
- Will wait until 'jc/diff-unique-abbrev-comments' graduates, rebase
81
- onto 'master' and then cook in 'next'.
141
+ Will merge to 'next'.
142
143
84
-* pt/gitgui-updates (2016-10-20) 35 commits
85
- - Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
86
- - git-gui: set version 0.21
87
- - Merge branch 'as/bulgarian' into pu
88
- - git-gui: Mark 'All' in remote.tcl for translation
89
- - git-gui i18n: Updated Bulgarian translation (565,0f,0u)
90
- - Merge branch 'os/preserve-author' into pu
91
- - git-gui: avoid persisting modified author identity
92
- - git-gui: Do not reset author details on amend
93
- - Merge branch 'kb/unicode' into pu
94
- - git-gui: handle the encoding of Git's output correctly
95
- - git-gui: unicode file name support on windows
96
- - Merge branch 'dr/ru' into pu
97
- - git-gui: Update Russian translation
98
- - git-gui: maintain backwards compatibility for merge syntax
99
- - Merge branch 'va/i18n_2' into pu
100
- - git-gui i18n: mark string in lib/error.tcl for translation
101
- - git-gui: fix incorrect use of Tcl append command
102
- - git-gui i18n: mark "usage:" strings for translation
103
- - git-gui i18n: internationalize use of colon punctuation
104
- - Merge branch 'pt/non-mouse-usage' into pu
105
- - Amend tab ordering and text widget border and highlighting.
106
- - Allow keyboard control to work in the staging widgets.
107
- - Merge branch 'pt/git4win-mods' into pu
108
- - git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`
109
- - git-gui: fix detection of Cygwin
110
- - Merge branch 'patches' into pu
111
- - git-gui: ensure the file in the diff pane is in the list of selected files
112
- - git-gui: support for $FILENAMES in tool definitions
113
- - git-gui: fix initial git gui message encoding
114
- - git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
115
- - Merge branch 'va/i18n' into pu
116
- - Merge branch 'rs/use-modern-git-merge-syntax' into pu
117
- - Merge branch 'js/commit-gpgsign' into pu
118
- - Merge branch 'sy/i18n' into pu
119
- - git-gui: sort entries in tclIndex
144
+* ls/git-open-cloexec (2016-10-24) 3 commits
145
+ - SQUASH???
146
+ - read-cache: make sure file handles are not inherited by child processes
147
+ - sha1_file: open window into packfiles with CLOEXEC
148
121
- Will merge to 'master'.
122
- Parked here temporarily as I didn't have chance to double-check.
149
+ Git generally does not explicitly close file descriptors that were
150
+ open in the parent process when spawning a child process, but most
151
+ of the time the child does not want to access them. As Windows does
152
+ not allow removing or renaming a file that has a file descriptor
153
+ open, a slow-to-exit child can even break the parent process by
154
+ holding onto them. Use O_CLOEXEC flag to open files in various
155
+ codepaths.
156
157
+ Under discussion.
158
+ cf. <20161024183900.GA12769@starla>
159
125
-* yk/git-tag-remove-mention-of-old-layout-in-doc (2016-10-20) 1 commit
126
- - doc: remove reference to the traditional layout in git-tag.txt
160
+ This needs to be merged before ls/filter-process so that it won't
161
+ break Windows.
162
128
- Shorten description of auto-following in "git tag" by removing a
129
- mention of historical remotes layout which is not relevant to the
130
- main topic.
163
132
- Will merge to 'next'.
164
+* rs/ring-buffer-wraparound (2016-10-24) 1 commit
165
+ - hex: make wraparound of the index into ring-buffer explicit
166
+
167
+ The code that we have used for the past 10+ years to cycle
168
+ 4-element ring buffers turns out to be not quite portable in
169
+ theoretical world.
170
171
+ Under discussion.
172
+ cf. <b1f9054e-fadb-c2d3-bf95-00e88e1fb85b@web.de>
173
+
174
+
175
--------------------------------------------------
176
[Stalled]
177
@@ -247,6 +288,124 @@ of the repositories listed at
288
--------------------------------------------------
289
[Cooking]
290
291
+* jc/merge-base-fp-only (2016-10-19) 8 commits
292
+ . merge-base: fp experiment
293
+ - merge: allow to use only the fp-only merge bases
294
+ - merge-base: limit the output to bases that are on first-parent chain
295
+ - merge-base: mark bases that are on first-parent chain
296
+ - merge-base: expose get_merge_bases_many_0() a bit more
297
+ - merge-base: stop moving commits around in remove_redundant()
298
+ - sha1_name: remove ONELINE_SEEN bit
299
+ - commit: simplify fastpath of merge-base
300
+
301
+ An experiment of merge-base that ignores common ancestors that are
302
+ not on the first parent chain.
303
+
304
+
305
+* bw/submodule-branch-dot-doc (2016-10-19) 1 commit
306
+ (merged to 'next' on 2016-10-21 at 18aad25ba8)
307
+ + submodules doc: update documentation for "." used for submodule branches
308
+
309
+ Recent git allows submodule.<name>.branch to use a special token
310
+ "." instead of the branch name; the documentation has been updated
311
+ to describe it.
312
+
313
+ Will merge to 'master'.
314
+
315
+
316
+* tg/add-chmod+x-fix (2016-10-20) 1 commit
317
+ (merged to 'next' on 2016-10-21 at 1585ac7139)
318
+ + t3700: fix broken test under !SANITY
319
+
320
+ A hot-fix for a test added by a recent topic that went to both
321
+ 'master' and 'maint' already.
322
+
323
+ Will merge to 'master'.
324
+
325
+
326
+* jk/diff-submodule-diff-inline (2016-10-20) 1 commit
327
+ (merged to 'next' on 2016-10-21 at 13f300805e)
328
+ + rev-list: use hdr_termination instead of a always using a newline
329
+
330
+ A recently graduated topic regressed "git rev-list --header"
331
+ output, breaking "gitweb". This has been fixed.
332
+
333
+ Will merge to 'master'.
334
+
335
+
336
+* jk/no-looking-at-dotgit-outside-repo (2016-10-20) 8 commits
337
+ - setup_git_env: avoid blind fall-back to ".git"
338
+ - diff: handle sha1 abbreviations outside of repository
339
+ - diff_aligned_abbrev: use "struct oid"
340
+ - diff_unique_abbrev: rename to diff_aligned_abbrev
341
+ - find_unique_abbrev: use 4-buffer ring
342
+ - test-*-cache-tree: setup git dir
343
+ - read info/{attributes,exclude} only when in repository
344
+ - Merge branch 'jc/diff-unique-abbrev-comments' into jk/no-looking-at-dotgit-outside-repo
345
+ (this branch uses jc/diff-unique-abbrev-comments.)
346
+
347
+ Update "git diff --no-index" codepath not to try to peek into .git/
348
+ directory that happens to be under the current directory, when we
349
+ know we are operating outside any repository.
350
+
351
+ Will wait until 'jc/diff-unique-abbrev-comments' graduates, rebase
352
+ onto 'master' and then cook in 'next'.
353
+
354
+
355
+* pt/gitgui-updates (2016-10-20) 35 commits
356
+ (merged to 'next' on 2016-10-21 at 4c8214095a)
357
+ + Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
358
+ + git-gui: set version 0.21
359
+ + Merge branch 'as/bulgarian' into pu
360
+ + git-gui: Mark 'All' in remote.tcl for translation
361
+ + git-gui i18n: Updated Bulgarian translation (565,0f,0u)
362
+ + Merge branch 'os/preserve-author' into pu
363
+ + git-gui: avoid persisting modified author identity
364
+ + git-gui: Do not reset author details on amend
365
+ + Merge branch 'kb/unicode' into pu
366
+ + git-gui: handle the encoding of Git's output correctly
367
+ + git-gui: unicode file name support on windows
368
+ + Merge branch 'dr/ru' into pu
369
+ + git-gui: Update Russian translation
370
+ + git-gui: maintain backwards compatibility for merge syntax
371
+ + Merge branch 'va/i18n_2' into pu
372
+ + git-gui i18n: mark string in lib/error.tcl for translation
373
+ + git-gui: fix incorrect use of Tcl append command
374
+ + git-gui i18n: mark "usage:" strings for translation
375
+ + git-gui i18n: internationalize use of colon punctuation
376
+ + Merge branch 'pt/non-mouse-usage' into pu
377
+ + Amend tab ordering and text widget border and highlighting.
378
+ + Allow keyboard control to work in the staging widgets.
379
+ + Merge branch 'pt/git4win-mods' into pu
380
+ + git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`
381
+ + git-gui: fix detection of Cygwin
382
+ + Merge branch 'patches' into pu
383
+ + git-gui: ensure the file in the diff pane is in the list of selected files
384
+ + git-gui: support for $FILENAMES in tool definitions
385
+ + git-gui: fix initial git gui message encoding
386
+ + git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
387
+ + Merge branch 'va/i18n' into pu
388
+ + Merge branch 'rs/use-modern-git-merge-syntax' into pu
389
+ + Merge branch 'js/commit-gpgsign' into pu
390
+ + Merge branch 'sy/i18n' into pu
391
+ + git-gui: sort entries in tclIndex
392
+
393
+ A new version of git-gui, now at its 0.21.0 tag.
394
+
395
+ Will merge to 'master'.
396
+
397
+
398
+* yk/git-tag-remove-mention-of-old-layout-in-doc (2016-10-20) 1 commit
399
+ (merged to 'next' on 2016-10-21 at 8d9e23b023)
400
+ + doc: remove reference to the traditional layout in git-tag.txt
401
+
402
+ Shorten description of auto-following in "git tag" by removing a
403
+ mention of historical remotes layout which is not relevant to the
404
+ main topic.
405
+
406
+ Will merge to 'master'.
407
+
408
+
409
* dk/worktree-dup-checkout-with-bare-is-ok (2016-10-14) 1 commit
410
(merged to 'next' on 2016-10-17 at 24594d3e56)
411
+ worktree: allow the main brach of a bare repository to be checked out
@@ -327,7 +486,7 @@ of the repositories listed at
486
Will merge to 'master'.
487
488
330
-* jt/trailer-with-cruft (2016-10-20) 8 commits
489
+* jt/trailer-with-cruft (2016-10-21) 8 commits
490
- trailer: support values folded to multiple lines
491
- trailer: forbid leading whitespace in trailers
492
- trailer: allow non-trailers in trailer block
@@ -345,7 +504,10 @@ of the repositories listed at
504
Waiting for review.
505
506
348
-* mm/send-email-cc-cruft-after-address (2016-10-14) 1 commit
507
+* mm/send-email-cc-cruft-after-address (2016-10-21) 3 commits
508
+ (merged to 'next' on 2016-10-21 at c7ec2b5025)
509
+ + Git.pm: add comment pointing to t9000
510
+ + t9000-addresses: update expected results after fix
511
(merged to 'next' on 2016-10-19 at 41e3f876cd)
512
+ parse_mailboxes: accept extra text after <...> address
513
@@ -438,15 +600,17 @@ of the repositories listed at
600
Will merge to 'master'.
601
602
441
-* js/prepare-sequencer (2016-10-17) 25 commits
603
+* js/prepare-sequencer (2016-10-21) 27 commits
604
- sequencer: mark all error messages for translation
605
- sequencer: start error messages consistently with lower case
606
- sequencer: quote filenames in error messages
607
- sequencer: mark action_name() for translation
608
- sequencer: remove overzealous assumption in rebase -i mode
447
- - sequencer: refactor write_message()
609
+ - sequencer: teach write_message() to append an optional LF
610
+ - sequencer: refactor write_message() to take a pointer/length
611
+ - sequencer: roll back lock file if write_message() failed
612
+ - sequencer: stop releasing the strbuf in write_message()
613
- sequencer: left-trim lines read from the script
449
- - sequencer: do not try to commit when there were merge conflicts
614
- sequencer: support cleaning up commit messages
615
- sequencer: support amending commits
616
- sequencer: allow editing the commit message on a case-by-case basis
@@ -459,7 +623,7 @@ of the repositories listed at
623
- sequencer: completely revamp the "todo" script parsing
624
- sequencer: refactor the code to obtain a short commit name
625
- sequencer: future-proof read_populate_todo()
462
- - sequencer: eventually release memory allocated for the option values
626
+ - sequencer: plug memory leaks for the option values
627
- sequencer: future-proof remove_sequencer_state()
628
- sequencer: avoid unnecessary indirection
629
- sequencer: use memoized sequencer directory path
@@ -468,7 +632,7 @@ of the repositories listed at
632
Update of the sequencer codebase to make it reusable to reimplement
633
"rebase -i" continues.
634
471
- Waiting for review.
635
+ Will merge to 'next'.
636
637
638
* sb/submodule-ignore-trailing-slash (2016-10-18) 3 commits
@@ -486,6 +650,8 @@ of the repositories listed at
650
cf. <alpine.DEB.2.20.1610131255001.197091@virtualbox>
651
cf. <CAGZ79kYrKGLEOO72aWuX5OOM-AecdFZFXRqBkRzhdAM-VbPFxA@mail.gmail.com>
652
653
+ What's the current state of this topic?
654
+
655
656
* st/verify-tag (2016-10-10) 7 commits
657
- t/t7004-tag: Add --format specifier tests
@@ -514,10 +680,18 @@ of the repositories listed at
680
Will merge to 'master'.
681
682
517
-* sb/attr (2016-10-11) 28 commits
683
+* sb/attr (2016-10-24) 36 commits
684
+ - completion: clone can initialize specific submodules
685
+ - clone: add --init-submodule=<pathspec> switch
686
+ - submodule update: add `--init-default-path` switch
687
+ - pathspec: allow escaped query values
688
+ - pathspec: allow querying for attributes
689
+ - pathspec: move prefix check out of the inner loop
690
+ - pathspec: move long magic parsing out of prefix_pathspec
691
+ - Documentation: fix a typo
692
+ - attr: keep attr stack for each check
693
- attr: convert to new threadsafe API
694
- attr: make git_check_attr_counted static
520
- - attr: make git_attr_counted static
695
- attr.c: outline the future plans by heavily commenting
696
- attr.c: always pass check[] to collect_some_attrs()
697
- attr.c: introduce empty_attr_check_elems()
@@ -546,6 +720,8 @@ of the repositories listed at
720
721
The attributes API has been updated so that it can later be
722
optimized using the knowledge of which attributes are queried.
723
+ Building on top of the updated API, the pathspec machinery learned
724
+ to select only paths with given attributes set.
725
726
727
* jc/ws-error-highlight (2016-10-04) 4 commits
@@ -562,8 +738,9 @@ of the repositories listed at
738
739
740
* jk/abbrev-auto (2016-10-03) 1 commit
565
- - find_unique_abbrev: move logic out of get_short_sha1()
566
- (this branch uses lt/abbrev-auto.)
741
+ (merged to 'next' on 2016-10-21 at 8aa3d760d8)
742
+ + find_unique_abbrev: move logic out of get_short_sha1()
743
+ (this branch is used by jc/abbrev-auto; uses lt/abbrev-auto.)
744
745
Updates the way approximate count of total objects is computed
746
while attempting to come up with a unique abbreviated object name,
@@ -573,10 +750,11 @@ of the repositories listed at
750
Undecided.
751
752
576
-* nd/ita-empty-commit (2016-09-28) 3 commits
753
+* nd/ita-empty-commit (2016-10-24) 4 commits
754
- commit: don't be fooled by ita entries when creating initial commit
578
- - diff-lib.c: enable --shift-ita in index_differs_from()
579
- - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
755
+ - commit: fix empty commit creation when there's no changes but ita entries
756
+ - diff: add --ita-[in]visible-in-index
757
+ - diff-lib: allow ita entries treated as "not yet exist in index"
758
759
When new paths were added by "git add -N" to the index, it was
760
enough to circumvent the check by "git commit" to refrain from
@@ -584,9 +762,7 @@ of the repositories listed at
762
prevented "git status" to show such a path as "new file" in the
763
"Changes not staged for commit" section.
764
587
- Expecting a reroll.
588
- cf. <xmqqzimrj03j.fsf@gitster.mtv.corp.google.com>
589
- cf. <xmqq8tubkgg5.fsf@gitster.mtv.corp.google.com>
765
+ Will merge to 'next'.
766
767
768
* lt/abbrev-auto (2016-10-03) 3 commits
@@ -594,7 +770,7 @@ of the repositories listed at
770
+ abbrev: auto size the default abbreviation
771
+ abbrev: prepare for new world order
772
+ abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing
597
- (this branch is used by jk/abbrev-auto.)
773
+ (this branch is used by jc/abbrev-auto and jk/abbrev-auto.)
774
775
Allow the default abbreviation length, which has historically been
776
7, to scale as the repository grows. The logic suggests to use 12
@@ -716,7 +892,7 @@ of the repositories listed at
892
all filtering need is served by this single process for multiple
893
paths, reducing the process creation overhead.
894
719
- Will merge to 'master'.
895
+ Will wait for ls/git-open-cloexec.
896
897
898
* hv/submodule-not-yet-pushed-fix (2016-10-10) 3 commits