What's cooking (2016/08) #06
Junio C Hamano committed
Aug 14, 2016 at 15:45 UTC
782d5376d83ad408d96b1a036b7f9ef34ec4e2b7
1 file changed
+84
-149
whats-cooking.txt
+84
-149
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2016, #05; Fri, 12)
4
-X-master-at: 2376d31787760af598db23bb3982a57419854e5c
5
-X-next-at: 4aa545fa7b5b325b00b863a1c813d5cd62d60123
3
+Subject: What's cooking in git.git (Aug 2016, #06; Sun, 14)
4
+X-master-at: 726cc2ba12c4573ab2e623077479c51019e1f3cd
5
+X-next-at: 17f0f752fffdc6201c440bd096f91b2b85ae0177
6
7
-What's cooking in git.git (Aug 2016, #05; Fri, 12)
7
+What's cooking in git.git (Aug 2016, #06; Sun, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,13 +12,8 @@ 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
-v2.9.3 has been tagged as the third maintenance release for 2.9
16
-series. I am planning to tag v2.10-rc0 preview this weekend. As
17
-the topics that are still in-flight (either in 'pu' or still
18
-outside) are mostly multi-patch series that can have large impact,
19
-I think it is safe to say that they are not likely to be in the
20
-upcoming 2.10 but some of them may hit 'next' during the pre-release
21
-feature freeze. We'll see.
15
+The preview for the upcoming 2.10 release has been tagged as
16
+v2.10.0-rc0.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -26,134 +21,68 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
29
-[Graduated to "master"]
30
-
31
-* ew/http-backend-batch-headers (2016-08-10) 1 commit
32
- (merged to 'next' on 2016-08-11 at 93476b4)
33
- + http-backend: buffer headers before sending
34
-
35
- The http-backend (the server-side component of smart-http
36
- transport) used to trickle the HTTP header one at a time. Now
37
- these write(2)s are batched.
38
-
39
-
40
-* jk/big-and-future-archive-tar (2016-08-06) 1 commit
41
- (merged to 'next' on 2016-08-11 at 0abbd07)
42
- + archive-tar: make write_extended_header() void
43
-
44
- A small code clean-up.
45
-
46
-
47
-* jk/trace-fixup (2016-08-05) 8 commits
48
- (merged to 'next' on 2016-08-11 at 56f7621)
49
- + trace: do not fall back to stderr
50
- + write_or_die: drop write_or_whine_pipe()
51
- + trace: disable key after write error
52
- + trace: correct variable name in write() error message
53
- + trace: cosmetic fixes for error messages
54
- + trace: use warning() for printing trace errors
55
- + trace: stop using write_or_whine_pipe()
56
- + trace: handle NULL argument in trace_disable()
57
-
58
- Various small fixups to the "GIT_TRACE" facility.
59
-
60
-
61
-* js/import-tars-hardlinks (2016-08-03) 1 commit
62
- (merged to 'next' on 2016-08-11 at 034230e)
63
- + import-tars: support hard links
64
-
65
- "import-tars" fast-import script (in contrib/) used to ignore a
66
- hardlink target and replaced it with an empty file, which has been
67
- corrected to record the same blob as the other file the hardlink is
68
- shared with.
69
-
70
-
71
-* js/mv-dir-to-new-directory (2016-08-08) 1 commit
72
- (merged to 'next' on 2016-08-11 at c806ba2)
73
- + git mv: do not keep slash in `git mv dir non-existing-dir/`
74
-
75
- "git mv dir non-existing-dir/" did not work in some environments
76
- the same way as existing mainstream platforms. The code now moves
77
- "dir" to "non-existing-dir", without relying on rename("A", "B/")
78
- that strips the trailing slash of '/'.
79
-
80
-
81
-* kw/patch-ids-optim (2016-08-11) 4 commits
82
- (merged to 'next' on 2016-08-11 at f3ba3d0)
83
- + rebase: avoid computing unnecessary patch IDs
84
- + patch-ids: add flag to create the diff patch id using header only data
85
- + patch-ids: replace the seen indicator with a commit pointer
86
- + patch-ids: stop using a hand-rolled hashmap implementation
87
-
88
- When "git rebase" tries to compare set of changes on the updated
89
- upstream and our own branch, it computes patch-id for all of these
90
- changes and attempts to find matches. This has been optimized by
91
- lazily computing the full patch-id (which is expensive) to be
92
- compared only for changes that touch the same set of paths.
93
-
94
-
95
-* ms/document-pack-window-memory-is-per-thread (2016-08-10) 1 commit
96
- (merged to 'next' on 2016-08-11 at 228e96d)
97
- + document git-repack interaction of pack.threads and pack.windowMemory
98
-
99
-
100
-* rs/child-process-init (2016-08-05) 1 commit
101
- (merged to 'next' on 2016-08-11 at 860857b)
102
- + use CHILD_PROCESS_INIT to initialize automatic variables
24
+[New Topics]
25
104
- A small code clean-up.
26
+* rt/help-unknown (2016-08-12) 1 commit
27
+ - help: make option --help open man pages only for Git commands
28
29
+ "git nosuchcommand --help" said "No manual entry for gitnosuchcommand",
30
+ which was not intuitive, given that "git nosuchcommand" said "git:
31
+ 'nosuchcommand' is not a git command".
32
107
-* rs/merge-add-strategies-simplification (2016-08-05) 1 commit
108
- (merged to 'next' on 2016-08-11 at 6b8dfc1)
109
- + merge: use string_list_split() in add_strategies()
33
+ "git help everyday" seems to get broken with this change, though.
34
111
- A small code clean-up.
35
36
+* va/i18n (2016-08-12) 3 commits
37
+ - t7411: become resilient to GETTEXT_POISON
38
+ - t5520: become resilient to GETTEXT_POISON
39
+ - t3404: become resilient to GETTEXT_POISON
40
114
-* rs/merge-recursive-string-list-init (2016-08-05) 1 commit
115
- (merged to 'next' on 2016-08-11 at 37e62ba)
116
- + merge-recursive: use STRING_LIST_INIT_NODUP
41
+ A handful of tests that were broken under gettext-poison build have
42
+ been fixed.
43
118
- A small code clean-up.
44
+ Will merge to 'next'.
45
46
121
-* rs/use-strbuf-add-unique-abbrev (2016-08-06) 1 commit
122
- (merged to 'next' on 2016-08-11 at 81ac5ff)
123
- + use strbuf_add_unique_abbrev() for adding short hashes
47
+* jk/difftool-command-not-found (2016-08-14) 1 commit
48
+ - difftool: always honor "command not found" exit code
49
125
- A small code clean-up.
50
+ "git difftool" by default ignores the error exit from the backend
51
+ commands it spawns, because often they signal that they found
52
+ differences by exiting with a non-zero status code just like "diff"
53
+ does; the exit status codes 126 and 127 however are special in that
54
+ they are used to signal that the command is not executable or does
55
+ not exist. "git difftool" has been taught to notice these exit
56
+ status codes.
57
58
+ Will merge to 'next'.
59
128
-* sb/submodule-clone-retry (2016-08-09) 1 commit
129
- (merged to 'next' on 2016-08-11 at 4600b20)
130
- + submodule--helper: use parallel processor correctly
60
132
- Fix-up to an error codepath in a topic already in 'master'.
61
+* jk/tighten-alloc (2016-08-13) 2 commits
62
+ - receive-pack: use FLEX_ALLOC_MEM in queue_command()
63
+ - correct FLEXPTR_* example in comment
64
65
+ Will merge to 'next'.
66
135
-* va/i18n (2016-08-10) 3 commits
136
- (merged to 'next' on 2016-08-11 at d6e1422)
137
- + i18n: git-stash: mark messages for translation
138
- + i18n: archive: mark errors for translation
139
- + i18n: setup: mark error messages for translation
67
68
+* rs/mailinfo-lib (2016-08-13) 1 commit
69
+ - mailinfo: recycle strbuf in check_header()
70
142
-* vs/completion-branch-fully-spelled-d-m-r (2016-08-09) 1 commit
143
- (merged to 'next' on 2016-08-11 at a6f189c)
144
- + completion: complete --delete, --move, and --remotes for git branch
71
+ Will merge to 'next'.
72
73
147
-* vs/typofix (2016-08-11) 1 commit
148
- (merged to 'next' on 2016-08-11 at 435c418)
149
- + Spelling fixes
74
+* rs/pull-signed-tag (2016-08-13) 4 commits
75
+ - commit: use FLEX_ARRAY in struct merge_remote_desc
76
+ - merge-recursive: fix verbose output for multiple base trees
77
+ - commit: factor out set_merge_remote_desc()
78
+ - commit: use xstrdup() in get_merge_parent()
79
151
---------------------------------------------------
152
-[New Topics]
80
+ When "git merge-recursive" works on history with many criss-cross
81
+ merges in "verbose" mode, the names the command assigns to the
82
+ virtual merge bases could have overwritten each other by unintended
83
+ reuse of the same piece of memory.
84
154
-* tb/t0027-raciness-fix (2016-08-12) 2 commits
155
- - convert: missing `LF will be replaced by CRLF
156
- - t0027: Correct raciness in NNO test
85
+ Will merge to 'next'.
86
87
--------------------------------------------------
88
[Stalled]
@@ -228,23 +157,6 @@ of the repositories listed at
157
cf. <CACsJy8AiER_=5aJ65r+GPCE_nXbrPTAMKJi=FuJgT8zzV2-NFw@mail.gmail.com>
158
159
231
-* po/range-doc (2016-07-20) 8 commits
232
- - doc: revisions - clarify reachability examples
233
- - doc: revisions - define `reachable`
234
- - doc: gitrevisions - clarify 'latter case' is revision walk
235
- - doc: gitrevisions - use 'reachable' in page description
236
- - doc: give headings for the two and three dot notations
237
- - doc: show the actual left, right, and boundary marks
238
- - doc: revisions - name the left and right sides
239
- - doc: use 'symmetric difference' consistently
240
-
241
- Clarify various ways to specify the "revision ranges" in the
242
- documentation.
243
-
244
- Updates in 4/8 ("give headings") is reported to break formatting?
245
- cf. <57913C97.1030001@xiplink.com>
246
-
247
-
160
* jc/attr (2016-05-25) 18 commits
161
- attr: support quoting pathname patterns in C style
162
- attr: expose validity check for attribute names
@@ -458,11 +370,35 @@ of the repositories listed at
370
--------------------------------------------------
371
[Cooking]
372
461
-* jk/diff-submodule-diff-inline (2016-08-11) 5 commits
462
- - SQUASH??? clarify the if/{if/else} nesting
463
- - SQUASH???
373
+* po/range-doc (2016-08-13) 12 commits
374
+ - doc: revisions: sort examples and fix alignment of the unchanged
375
+ - doc: revisions: show revision expansion in examples
376
+ - doc: revisions - clarify reachability examples
377
+ - doc: revisions - define `reachable`
378
+ - doc: gitrevisions - clarify 'latter case' is revision walk
379
+ - doc: gitrevisions - use 'reachable' in page description
380
+ - doc: revisions: single vs multi-parent notation comparison
381
+ - doc: revisions: extra clarification of <rev>^! notation effects
382
+ - doc: revisions: give headings for the two and three dot notations
383
+ - doc: show the actual left, right, and boundary marks
384
+ - doc: revisions - name the left and right sides
385
+ - doc: use 'symmetric difference' consistently
386
+
387
+ Clarify various ways to specify the "revision ranges" in the
388
+ documentation.
389
+
390
+ Waiting for review discussion to settle.
391
+
392
+
393
+* tb/t0027-raciness-fix (2016-08-14) 1 commit
394
+ - convert: Correct NNO tests and missing `LF will be replaced by CRLF`
395
+
396
+ The t0027 test for CRLF conversion was timing dependent and flaky.
397
+
398
+
399
+* jk/diff-submodule-diff-inline (2016-08-12) 3 commits
400
- diff: add SUBMODULE_DIFF format to display submodule diff
465
- - diff: add --line-prefix option for passing in a prefix
401
+ - diff: add --diff-line-prefix option for passing in a prefix
402
- diff.c: remove output_prefix_length field
403
404
The "git diff --submodule={short,log}" mechanism has been enhanced
@@ -491,22 +427,20 @@ of the repositories listed at
427
cf. <20160808181942.GD3995@teco.navytux.spb.ru>
428
429
494
-* sb/submodule-clone-rr (2016-08-09) 9 commits
495
- - submodule: try alternates when superproject has an alternate
496
- - submodule helper: pass through --reference-if-able
430
+* sb/submodule-clone-rr (2016-08-12) 8 commits
431
+ - clone: recursive and reference option triggers submodule alternates
432
- clone: implement optional references
433
- clone: clarify option_reference as required
434
+ - clone: factor out checking for an alternate path
435
- submodule--helper update-clone: allow multiple references
436
- submodule--helper module-clone: allow multiple references
501
- - SQUASH???
437
- t7408: merge short tests, factor out testing method
438
- t7408: modernize style
439
505
- Waiting for review discussion to settle.
506
- cf. <20160806012318.17968-1-sbeller@google.com>
440
+ Any more comments?
441
442
509
-* jh/status-v2-porcelain (2016-08-11) 9 commits
443
+* jh/status-v2-porcelain (2016-08-12) 9 commits
444
- status: unit tests for --porcelain=v2
445
- test-lib-functions.sh: add lf_to_nul helper
446
- git-status.txt: describe --porcelain=v2 format
@@ -522,7 +456,7 @@ of the repositories listed at
456
further be used to teach git-prompt (in contrib/) to make fewer
457
calls to git.
458
525
- Waiting for review discussion to settle.
459
+ Any more comments?
460
461
462
* mh/diff-indent-heuristic (2016-08-04) 8 commits
@@ -610,7 +544,8 @@ of the repositories listed at
544
545
546
* jk/rebase-i-drop-ident-check (2016-07-29) 1 commit
613
- - rebase-interactive: drop early check for valid ident
547
+ (merged to 'next' on 2016-08-14 at 6891bcd)
548
+ + rebase-interactive: drop early check for valid ident
549
550
Even when "git pull --rebase=preserve" (and the underlying "git
551
rebase --preserve") can complete without creating any new commit
@@ -620,7 +555,7 @@ of the repositories listed at
555
would fail with a more meaningful error message and advice text
556
when the bogus ident matters, this extra check was removed.
557
623
- Will hold.
558
+ Will hold to see if people scream.
559
cf. <20160729224944.GA23242@sigill.intra.peff.net>
560
561