What's cooking (2017/06 #09)
Junio C Hamano committed
Jun 30, 2017 at 14:38 UTC
161042673fb57156cb5b4608b35774eebb3f7d3d
1 file changed
+141
-171
whats-cooking.txt
+141
-171
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2017, #08; Wed, 28)
4
-X-master-at: e0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7
5
-X-next-at: 1cf373c61ae85f2e2e7e489e31d4b7eebf850f1f
3
+Subject: What's cooking in git.git (Jun 2017, #09; Fri, 30)
4
+X-master-at: 5116f791c12dda6b6c22fa85b600a8e30dfa168a
5
+X-next-at: 7f5404b183d51b3e3066c995608b78ea314ee660
6
7
-What's cooking in git.git (Jun 2017, #08; Wed, 28)
7
+What's cooking in git.git (Jun 2017, #09; Fri, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,67 +20,22 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
-* dt/raise-core-packed-git-limit (2017-06-21) 1 commit
24
- (merged to 'next' on 2017-06-22 at bc1a90f077)
25
- + docs: update 64-bit core.packedGitLimit default
26
-
27
- Doc update for a topic already in 'master'.
28
-
29
-
30
-* jk/add-p-commentchar-fix (2017-06-21) 2 commits
31
- (merged to 'next' on 2017-06-22 at 5a1d464e6d)
32
- + add--interactive: quote commentChar regex
33
- + add--interactive: handle EOF in prompt_yesno
34
-
35
- "git add -p" were updated in 2.12 timeframe to cope with custom
36
- core.commentchar but the implementation was buggy and a
37
- metacharacter like $ and * did not work.
38
-
39
-
40
-* ks/t7508-indent-fix (2017-06-21) 1 commit
41
- (merged to 'next' on 2017-06-22 at d12526967b)
42
- + t7508: fix a broken indentation
43
-
44
- Cosmetic update to a test.
45
-
46
-
47
-* lb/status-stash-count (2017-06-18) 3 commits
48
- (merged to 'next' on 2017-06-22 at 86bc2f2213)
49
- + glossary: define 'stash entry'
50
- + status: add optional stash count information
51
- + stash: update documentation to use 'stash entry'
52
-
53
- "git status" learned to optionally give how many stash entries the
54
- user has in its output.
55
-
56
-
57
-* mb/reword-autocomplete-message (2017-06-21) 1 commit
58
- (merged to 'next' on 2017-06-22 at 878888a743)
59
- + auto-correct: tweak phrasing
60
-
61
- Message update.
62
-
63
-
64
-* mh/packed-ref-store-prep (2017-06-18) 2 commits
65
- (merged to 'next' on 2017-06-22 at 3f7a4da1e8)
66
- + for_each_bisect_ref(): don't trim refnames
67
- + lock_packed_refs(): fix cache validity check
68
- (this branch is used by mh/packed-ref-store and mh/packed-ref-store-prep-extra.)
23
+* ab/die-errors-in-threaded (2017-06-21) 1 commit
24
+ (merged to 'next' on 2017-06-24 at 135fc4b963)
25
+ + die(): stop hiding errors due to overzealous recursion guard
26
70
- Bugfix for a topic that is (only) in 'master'.
27
+ Traditionally, the default die() routine had a code to prevent it
28
+ from getting called multiple times, which interacted badly when a
29
+ threaded program used it (one downside is that the real error may
30
+ be hidden and instead the only error message given to the user may
31
+ end up being "die recursion detected", which is not very useful).
32
72
---------------------------------------------------
73
-[New Topics]
33
75
-* ab/strbuf-addftime-tzname-boolify (2017-06-24) 3 commits
76
- - REWORD ONLY SQUASH
77
- - strbuf: change an always NULL/"" strbuf_addftime() param to bool
78
- - strbuf.h comment: discuss strbuf_addftime() arguments in order
79
-
80
- strbuf_addftime() is further getting tweaked.
34
+* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit
35
+ (merged to 'next' on 2017-06-26 at d7489fc831)
36
+ + doc: clarify syntax for %C(auto,...) in pretty formats
37
82
- Waiting for a response.
83
- cf. <xmqqk2419rhg.fsf@gitster.mtv.corp.google.com>
38
+ Doc update.
39
40
41
* jc/pack-bitmap-unaligned (2017-06-26) 1 commit
@@ -89,16 +44,37 @@ of the repositories listed at
44
45
An unaligned 32-bit access in pack-bitmap code ahs been corrected.
46
92
- Will merge to 'master'.
47
48
+* ks/status-initial-commit (2017-06-21) 1 commit
49
+ (merged to 'next' on 2017-06-24 at 940ffd5816)
50
+ + status: contextually notify user about an initial commit
51
95
-* mt/p4-parse-G-output (2017-06-27) 1 commit
96
- . git-p4: parse marshal output "p4 -G" in p4 changes
52
+ "git status" has long shown essentially the same message as "git
53
+ commit"; the message it gives while preparing for the root commit,
54
+ i.e. "Initial commit", was hard to understand for some new users.
55
+ Now it says "No commits yet" to stress more on the current status
56
+ (rather than the commit the user is preparing for, which is more in
57
+ line with the focus of "git commit").
58
98
- Use "p4 -G" to make "p4 changes" output more Python-friendly
99
- to parse.
59
101
- Needs review/ack from git-p4 folks.
60
+* ks/submodule-add-doc (2017-06-22) 1 commit
61
+ (merged to 'next' on 2017-06-24 at 26309b38f2)
62
+ + Documentation/git-submodule: cleanup "add" section
63
+
64
+ Doc update.
65
+
66
+
67
+* pw/rebase-i-regression-fix-tests (2017-06-23) 5 commits
68
+ (merged to 'next' on 2017-06-23 at 835ae762f5)
69
+ + t3420: fix under GETTEXT_POISON build
70
+ (merged to 'next' on 2017-06-22 at d1dde1672a)
71
+ + rebase: add more regression tests for console output
72
+ + rebase: add regression tests for console output
73
+ + rebase -i: add test for reflog message
74
+ + sequencer: print autostash messages to stderr
75
+
76
+ Fix a recent regression to "git rebase -i" and add tests that would
77
+ have caught it and others.
78
79
80
* rs/apply-validate-input (2017-06-27) 3 commits
@@ -109,8 +85,6 @@ of the repositories listed at
85
86
Tighten error checks for invalid "git apply" input.
87
112
- Will merge to 'master'.
113
-
88
89
* vs/typofixes (2017-06-27) 1 commit
90
(merged to 'next' on 2017-06-28 at 3d11e0b3fa)
@@ -118,39 +92,50 @@ of the repositories listed at
92
93
Many typofixes.
94
121
- Will merge to 'master'.
122
-
95
+--------------------------------------------------
96
+[New Topics]
97
124
-* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit
125
- - subtree: honour USE_ASCIIDOCTOR when set
98
+* ab/grep-lose-opt-regflags (2017-06-30) 6 commits
99
+ - grep: remove redundant REG_NEWLINE when compiling fixed regex
100
+ - grep: remove regflags from the public grep_opt API
101
+ - grep: remove redundant and verbose re-assignments to 0
102
+ - grep: remove redundant "fixed" field re-assignment to 0
103
+ - grep: adjust a redundant grep pattern type assignment
104
+ - grep: remove redundant double assignment to 0
105
127
- The Makefile rule in contrib/subtree for building documentation
128
- learned to honour USE_ASCIIDOCTOR just like the main documentation
129
- set does.
106
+ Code cleanup.
107
108
Will merge to 'next'.
109
110
134
-* js/fsck-name-object (2017-06-28) 1 commit
135
- - t1450: use egrep for regexp "alternation"
111
+* ks/commit-assuming-only-warning-removal (2017-06-30) 2 commits
112
+ - commit-template: distinguish status information unconditionally
113
+ - commit-template: remove outdated notice about explicit paths
114
137
- Test fix.
115
+ An old message shown in the commit log template was removed, as it
116
+ has outlived its usefulness.
117
118
Will merge to 'next'.
119
120
142
-* jc/utf8-fprintf (2017-06-28) 1 commit
143
- - submodule--helper: do not call utf8_fprintf() unnecessarily
121
+* sb/hashmap-customize-comparison (2017-06-30) 3 commits
122
+ - hashmap: migrate documentation from Documentation/technical into header
123
+ - patch-ids.c: use hashmap correctly
124
+ - hashmap.h: compare function has access to a data field
125
+ (this branch is used by sb/diff-color-move.)
126
145
- Code cleanup.
127
+ Update the hashmap API so that data to customize the behaviour of
128
+ the comparison function can be specified at the time a hashmap is
129
+ initialized. This fixes a bug in patch-ids that may have caused
130
+ segfault.
131
147
- Will merge to 'next'.
132
133
+* sb/merge-recursive-code-cleanup (2017-06-30) 1 commit
134
+ - merge-recursive: use DIFF_XDL_SET macro
135
150
-* rs/free-and-null (2017-06-28) 1 commit
151
- - coccinelle: polish FREE_AND_NULL rules
136
+ Code clean-up.
137
153
- Code cleanup.
138
+ Will merge to 'next'.
139
140
--------------------------------------------------
141
[Stalled]
@@ -234,23 +219,69 @@ of the repositories listed at
219
--------------------------------------------------
220
[Cooking]
221
237
-* ab/wildmatch (2017-06-23) 1 commit
238
- - wildmatch: remove unused wildopts parameter
222
+* ab/strbuf-addftime-tzname-boolify (2017-06-24) 3 commits
223
+ - REWORD ONLY SQUASH
224
+ - strbuf: change an always NULL/"" strbuf_addftime() param to bool
225
+ - strbuf.h comment: discuss strbuf_addftime() arguments in order
226
240
- Prepare the wildmatch API for future enhancements to allow a
241
- pattern that is repeatedly matched against many strings to be
242
- precompiled.
227
+ strbuf_addftime() is further getting tweaked.
228
229
+ Waiting for a response.
230
+ cf. <xmqqk2419rhg.fsf@gitster.mtv.corp.google.com>
231
245
-* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit
246
- (merged to 'next' on 2017-06-26 at d7489fc831)
247
- + doc: clarify syntax for %C(auto,...) in pretty formats
232
249
- Doc update.
233
+* mt/p4-parse-G-output (2017-06-27) 1 commit
234
+ . git-p4: parse marshal output "p4 -G" in p4 changes
235
+
236
+ Use "p4 -G" to make "p4 changes" output more Python-friendly
237
+ to parse.
238
+
239
+ Needs review/ack from git-p4 folks.
240
+
241
+
242
+* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit
243
+ (merged to 'next' on 2017-06-30 at af23bd111b)
244
+ + subtree: honour USE_ASCIIDOCTOR when set
245
+
246
+ The Makefile rule in contrib/subtree for building documentation
247
+ learned to honour USE_ASCIIDOCTOR just like the main documentation
248
+ set does.
249
250
Will merge to 'master'.
251
252
253
+* js/fsck-name-object (2017-06-28) 1 commit
254
+ (merged to 'next' on 2017-06-30 at 9a08514cf2)
255
+ + t1450: use egrep for regexp "alternation"
256
+
257
+ Test fix.
258
+
259
+ Will merge to 'master'.
260
+
261
+
262
+* jc/utf8-fprintf (2017-06-28) 1 commit
263
+ (merged to 'next' on 2017-06-30 at a8cc490818)
264
+ + submodule--helper: do not call utf8_fprintf() unnecessarily
265
+
266
+ Code cleanup.
267
+
268
+ Will merge to 'master'.
269
+
270
+
271
+* rs/free-and-null (2017-06-29) 1 commit
272
+ - coccinelle: polish FREE_AND_NULL rules
273
+
274
+ Code cleanup.
275
+
276
+
277
+* ab/wildmatch (2017-06-23) 1 commit
278
+ - wildmatch: remove unused wildopts parameter
279
+
280
+ Prepare the wildmatch API for future enhancements to allow a
281
+ pattern that is repeatedly matched against many strings to be
282
+ precompiled.
283
+
284
+
285
* cc/shared-index-permfix (2017-06-25) 3 commits
286
(merged to 'next' on 2017-06-26 at bb41584bf0)
287
+ t1700: make sure split-index respects core.sharedrepository
@@ -276,7 +307,7 @@ of the repositories listed at
307
year? A deprecation warning period that is about 1 year does not
308
sound too bad.
309
279
- Will merge to 'master'.
310
+ Will cook in 'next'.
311
312
313
* sb/pull-rebase-submodule (2017-06-27) 4 commits
@@ -289,19 +320,6 @@ of the repositories listed at
320
branch in the submodules to an updated base.
321
322
292
-* ab/die-errors-in-threaded (2017-06-21) 1 commit
293
- (merged to 'next' on 2017-06-24 at 135fc4b963)
294
- + die(): stop hiding errors due to overzealous recursion guard
295
-
296
- Traditionally, the default die() routine had a code to prevent it
297
- from getting called multiple times, which interacted badly when a
298
- threaded program used it (one downside is that the real error may
299
- be hidden and instead the only error message given to the user may
300
- end up being "die recursion detected", which is not very useful).
301
-
302
- Will merge to 'master'.
303
-
304
-
323
* bw/repo-object (2017-06-23) 21 commits
324
(merged to 'next' on 2017-06-26 at ed9c0b77c3)
325
+ ls-files: use repository object
@@ -333,27 +351,15 @@ of the repositories listed at
351
Will merge to 'master'.
352
353
336
-* ks/submodule-add-doc (2017-06-22) 1 commit
337
- (merged to 'next' on 2017-06-24 at 26309b38f2)
338
- + Documentation/git-submodule: cleanup "add" section
339
-
340
- Doc update.
341
-
342
- Will merge to 'master'.
343
-
344
-
345
-* pw/unquote-path-in-git-pm (2017-06-24) 5 commits
346
- - git-add--interactive.perl: Use unquote_path() from Git.pm
347
- - Add tests for Git::unquote_path()
348
- - Git::unquote_path() throw an exception on bad path
349
- - Git::unquote_path() Handle '\a'
350
- - Git.pm: add unquote_path()
354
+* pw/unquote-path-in-git-pm (2017-06-30) 4 commits
355
+ - t9700: add tests for Git::unquote_path()
356
+ - Git::unquote_path(): throw an exception on bad path
357
+ - Git::unquote_path(): handle '\a'
358
+ - add -i: move unquote_path() to Git.pm
359
360
Code refactoring.
361
354
- Expecting a reroll.
355
- The structure of the series has a bit to be desired, but the end
356
- result looked mostly OK.
362
+ Will merge to 'next'.
363
364
365
* rs/sha1-name-readdir-optim (2017-06-24) 4 commits
@@ -386,20 +392,6 @@ of the repositories listed at
392
Will merge to 'master'.
393
394
389
-* ks/status-initial-commit (2017-06-21) 1 commit
390
- (merged to 'next' on 2017-06-24 at 940ffd5816)
391
- + status: contextually notify user about an initial commit
392
-
393
- "git status" has long shown essentially the same message as "git
394
- commit"; the message it gives while preparing for the root commit,
395
- i.e. "Initial commit", was hard to understand for some new users.
396
- Now it says "No commits yet" to stress more on the current status
397
- (rather than the commit the user is preparing for, which is more in
398
- line with the focus of "git commit").
399
-
400
- Will merge to 'master'.
401
-
402
-
395
* mh/packed-ref-store (2017-06-23) 29 commits
396
- read_packed_refs(): die if `packed-refs` contains bogus data
397
- repack_without_refs(): don't lock or unlock the packed refs
@@ -457,8 +449,9 @@ of the repositories listed at
449
and possibly rebasing on them.
450
451
460
-* ls/filter-process-delayed (2017-06-27) 6 commits
452
+* ls/filter-process-delayed (2017-06-30) 7 commits
453
- convert: add "status=delayed" to filter process protocol
454
+ - convert: refactor capabilities negotiation
455
- convert: move multiple file filter error handling to separate function
456
- convert: put the flags field before the flag itself for consistent style
457
- t0021: write "OUT <size>" only on success
@@ -468,24 +461,7 @@ of the repositories listed at
461
The filter-process interface learned to allow a process with long
462
latency give a "delayed" response.
463
471
- Getting reviewed.
472
- cf. <20170624142301.c5jl7xxf4ici3cug@sigill.intra.peff.net>
473
- cf. <xmqqzicu4lnq.fsf@gitster.mtv.corp.google.com>
474
-
475
-
476
-* pw/rebase-i-regression-fix-tests (2017-06-23) 5 commits
477
- (merged to 'next' on 2017-06-23 at 835ae762f5)
478
- + t3420: fix under GETTEXT_POISON build
479
- (merged to 'next' on 2017-06-22 at d1dde1672a)
480
- + rebase: add more regression tests for console output
481
- + rebase: add regression tests for console output
482
- + rebase -i: add test for reflog message
483
- + sequencer: print autostash messages to stderr
484
-
485
- Fix a recent regression to "git rebase -i" and add tests that would
486
- have caught it and others.
487
-
488
- Will merge to 'master'.
464
+ Will merge to 'next'.
465
466
467
* ab/sha1dc (2017-06-27) 3 commits
@@ -513,13 +489,7 @@ of the repositories listed at
489
No more comments or updates?
490
491
516
-* sb/diff-color-move (2017-06-27) 31 commits
517
- - diff.c: detect blocks despite whitespace changes
518
- - diff.c: omit uninteresting moved lines
519
- - Documentation/diff: reword color moved
520
- - diff.c: better reporting on color.moved bogus configuration
521
- - diff.c: change the default for move coloring to zebra
522
- - diff.c: factor out shrinking of potential moved line blocks
492
+* sb/diff-color-move (2017-06-30) 26 commits
493
- diff: document the new --color-moved setting
494
- diff.c: add dimming to moved line detection
495
- diff.c: color moved lines differently, plain mode
@@ -545,13 +515,15 @@ of the repositories listed at
515
- diff.c: factor out diff_flush_patch_all_file_pairs
516
- diff.c: move line ending check into emit_hunk_header
517
- diff.c: readability fix
518
+ - Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move
519
+ (this branch uses sb/hashmap-customize-comparison.)
520
521
"git diff" has been taught to optionally paint new lines that are
522
the same as deleted lines elsewhere differently from genuinely new
523
lines.
524
553
- Expecting an evantual reroll.
554
- cf. <20170628005651.8110-1-sbeller@google.com>
525
+ Looking good.
526
+ cf. <CAGZ79kaK00CpXOtXnx_u7_KHbZq4Mz8vWHKy2a8p1gQ8ogE-OA@mail.gmail.com>
527
528
--------------------------------------------------
529
[Discarded]
@@ -590,5 +562,3 @@ of the repositories listed at
562
+ coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
563
564
The coccinelle rule for free-and-null refactoring got simplified.
593
-
594
-