What's cooking (2017/07 #03)
Junio C Hamano committed
Jul 10, 2017 at 15:25 UTC
008feced5acbbd64e924b80dd144178f20691f23
1 file changed
+187
-155
whats-cooking.txt
+187
-155
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2017, #02; Fri, 7)
4
-X-master-at: 8b2efe2a0fd93b8721879f796d848a9ce785647f
5
-X-next-at: a9c46e097be495732ddb19ee1f57e62e5b35db6c
3
+Subject: What's cooking in git.git (Jul 2017, #03; Mon, 10)
4
+X-master-at: 117ddefdb4dfd9b40ae60967a7327754d8ce7a87
5
+X-next-at: 49757e11198e539fd1f865512274d30d99f2fcdb
6
7
-What's cooking in git.git (Jul 2017, #02; Fri, 7)
7
+What's cooking in git.git (Jul 2017, #03; Mon, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,15 @@ 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
+We also have tons of small updates in preparation for 2.13.3 on
16
+'maint'. All of them are topics that have been merged to 'master'
17
+more than a few days ago, but I do not know how well they are tested
18
+in the field by people using 'master' in their everyday workflow.
19
+Ideally, our release process wants to see more people using 'next'
20
+in their everyday workflow to keep 'master' more stable than any
21
+tagged release, but I do not have a good idea on how to encourage
22
+it more than we currently do.
23
+
24
You can find the changes described here in the integration branches
25
of the repositories listed at
26
@@ -20,106 +29,180 @@ of the repositories listed at
29
--------------------------------------------------
30
[Graduated to "master"]
31
23
-* ab/sha1dc-maint (2017-07-03) 1 commit
24
- (merged to 'next' on 2017-07-05 at ac69c90b7e)
25
- + sha1dc: update from upstream
26
- (this branch is used by ab/sha1dc.)
32
+* ab/sha1dc (2017-07-03) 2 commits
33
+ (merged to 'next' on 2017-07-06 at 5a783032b7)
34
+ + sha1collisiondetection: automatically enable when submodule is populated
35
+ + sha1dc: optionally use sha1collisiondetection as a submodule
36
28
- Update the sha1dc again to fix portability glitches.
37
+ The "collission-detecting" implementation of SHA-1 hash we borrowed
38
+ from is replaced by directly binding the upstream project as our
39
+ submodule. Glitches on minority platforms are still being worked out.
40
+
41
+
42
+* ab/wildmatch (2017-06-23) 1 commit
43
+ (merged to 'next' on 2017-07-07 at 34482a9a4f)
44
+ + wildmatch: remove unused wildopts parameter
45
+
46
+ Minor code cleanup.
47
+
48
+
49
+* bb/unicode-10.0 (2017-07-07) 1 commit
50
+ (merged to 'next' on 2017-07-07 at a9c46e097b)
51
+ + unicode: update the width tables to Unicode 10
52
+
53
+ Update the character width tables.
54
+
55
+
56
+* jk/reflog-walk-maint (2017-07-07) 4 commits
57
+ (merged to 'next' on 2017-07-07 at 611554ba2f)
58
+ + reflog-walk: include all fields when freeing complete_reflogs
59
+ + reflog-walk: don't free reflogs added to cache
60
+ + reflog-walk: duplicate strings in complete_reflogs list
61
+ (merged to 'next' on 2017-07-06 at 7408dd80a1)
62
+ + reflog-walk: skip over double-null oid due to HEAD rename
63
+ (this branch is used by jk/reflog-walk.)
64
65
+ After "git branch --move" of the currently checked out branch, the
66
+ code to walk the reflog of HEAD via "log -g" and friends
67
+ incorrectly stopped at the reflog entry that records the renaming
68
+ of the branch.
69
31
-* ab/strbuf-addftime-tzname-boolify (2017-07-01) 2 commits
32
- (merged to 'next' on 2017-07-05 at 81e6795eb3)
33
- + strbuf: change an always NULL/"" strbuf_addftime() param to bool
34
- + strbuf.h comment: discuss strbuf_addftime() arguments in order
70
36
- strbuf_addftime() is further getting tweaked.
71
+* ks/commit-assuming-only-warning-removal (2017-06-30) 2 commits
72
+ (merged to 'next' on 2017-07-05 at 462a72df95)
73
+ + commit-template: distinguish status information unconditionally
74
+ + commit-template: remove outdated notice about explicit paths
75
76
+ An old message shown in the commit log template was removed, as it
77
+ has outlived its usefulness.
78
39
-* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit
40
- (merged to 'next' on 2017-06-30 at af23bd111b)
41
- + subtree: honour USE_ASCIIDOCTOR when set
79
43
- The Makefile rule in contrib/subtree for building documentation
44
- learned to honour USE_ASCIIDOCTOR just like the main documentation
45
- set does.
80
+* ks/typofix-commit-c-comment (2017-07-06) 1 commit
81
+ (merged to 'next' on 2017-07-07 at 64e98fc832)
82
+ + builtin/commit.c: fix a typo in the comment
83
84
+ Typofix.
85
48
-* jc/utf8-fprintf (2017-06-28) 1 commit
49
- (merged to 'next' on 2017-06-30 at a8cc490818)
50
- + submodule--helper: do not call utf8_fprintf() unnecessarily
86
+
87
+* pw/unquote-path-in-git-pm (2017-06-30) 4 commits
88
+ (merged to 'next' on 2017-07-05 at 538ab4d599)
89
+ + t9700: add tests for Git::unquote_path()
90
+ + Git::unquote_path(): throw an exception on bad path
91
+ + Git::unquote_path(): handle '\a'
92
+ + add -i: move unquote_path() to Git.pm
93
+
94
+ Code refactoring.
95
+
96
+
97
+* rs/free-and-null (2017-06-29) 1 commit
98
+ (merged to 'next' on 2017-07-06 at 9c9e1d59a2)
99
+ + coccinelle: polish FREE_AND_NULL rules
100
101
Code cleanup.
102
103
+--------------------------------------------------
104
+[New Topics]
105
55
-* js/fsck-name-object (2017-06-28) 1 commit
56
- (merged to 'next' on 2017-06-30 at 9a08514cf2)
57
- + t1450: use egrep for regexp "alternation"
106
+* kn/ref-filter-branch-list (2017-07-10) 4 commits
107
+ (merged to 'next' on 2017-07-10 at 35fd25c0dd)
108
+ + ref-filter.c: drop return from void function
109
+ + branch: set remote color in ref-filter branch immediately
110
+ + branch: use BRANCH_COLOR_LOCAL in ref-filter format
111
+ + branch: only perform HEAD check for local branches
112
59
- Test fix.
113
+ The rewrite of "git branch --list" using for-each-ref's internals
114
+ that happened in v2.13 regressed its handling of color.branch.local;
115
+ this has been fixed.
116
117
+ Will merge to 'master'.
118
62
-* js/t5534-rev-parse-gives-multi-line-output-fix (2017-07-05) 1 commit
63
- (merged to 'next' on 2017-07-05 at 5f964c44ba)
64
- + t5534: fix misleading grep invocation
119
66
- A few tests that tried to verify the contents of push certificates
67
- did not use 'git rev-parse' to formulate the line to look for in
68
- the certificate correctly.
120
+* rs/apply-avoid-over-reading (2017-07-09) 1 commit
121
+ (merged to 'next' on 2017-07-10 at 2d8191ec3f)
122
+ + apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
123
124
+ Code cleanup.
125
71
-* rs/apply-avoid-over-reading (2017-07-01) 1 commit
72
- (merged to 'next' on 2017-07-05 at 35730f3a47)
73
- + apply: use starts_with() in gitdiff_verify_name()
126
+ Will merge to 'master'.
127
75
- Code clean-up to fix possible buffer over-reading.
128
129
+* rs/progress-overall-throughput-at-the-end (2017-07-09) 1 commit
130
+ - progress: show overall rate in last update
131
78
-* sb/merge-recursive-code-cleanup (2017-06-30) 1 commit
79
- (merged to 'next' on 2017-07-05 at 4228240520)
80
- + merge-recursive: use DIFF_XDL_SET macro
132
+ The progress meter did not give a useful output when we haven't had
133
+ 0.5 seconds to measure the throughput during the interval. Instead
134
+ show the overall throughput rate at the end, which is a much more
135
+ useful number.
136
82
- Code clean-up.
137
+ Will merge to 'next'.
138
139
85
-* xz/send-email-batch-size (2017-07-05) 1 commit
86
- (merged to 'next' on 2017-07-05 at 92f3c31fbd)
87
- + send-email: --batch-size to work around some SMTP server limit
140
+* rs/sha1-file-micro-optim (2017-07-09) 2 commits
141
+ - SQUASH???
142
+ - sha1_file: add slash once in for_each_file_in_obj_subdir()
143
89
- "git send-email" learned to overcome some SMTP server limitation
90
- that does not allow many pieces of e-mails to be sent over a single
91
- session.
144
+ Code cleanup.
145
93
---------------------------------------------------
94
-[New Topics]
146
+ Perhaps drop.
147
+ cf. <f59c8256-716b-9305-2a4f-d4fe49f666ff@web.de>
148
96
-* jc/allow-lazy-cas (2017-07-06) 1 commit
97
- - push: disable lazy --force-with-lease by default
149
99
- Because "git push --force-with-lease[=<ref>]" that relies on the
100
- stability of remote-tracking branches is unsafe when something
101
- fetches into the repository behind user's back, it is now disabled
102
- by default. A new configuration variable can be used to enable it
103
- by users who know what they are doing. This would pave the way to
104
- possibly turn `--force` into `--force-with-lease`.
150
+* rs/urlmatch-cleanup (2017-07-09) 1 commit
151
+ (merged to 'next' on 2017-07-10 at 2dd3e7cab0)
152
+ + urlmatch: use hex2chr() in append_normalized_escapes()
153
106
- Will wait for feedback, then merge to and cook in 'next'.
154
+ Code cleanup.
155
156
+ Will merge to 'master'.
157
109
-* ks/typofix-commit-c-comment (2017-07-06) 1 commit
110
- (merged to 'next' on 2017-07-07 at 64e98fc832)
111
- + builtin/commit.c: fix a typo in the comment
158
113
- Typofix.
159
+* rs/use-div-round-up (2017-07-10) 1 commit
160
+ (merged to 'next' on 2017-07-10 at accb7919da)
161
+ + use DIV_ROUND_UP
162
+
163
+ Code cleanup.
164
165
Will merge to 'master'.
166
167
118
-* bb/unicode-10.0 (2017-07-07) 1 commit
119
- (merged to 'next' on 2017-07-07 at a9c46e097b)
120
- + unicode: update the width tables to Unicode 10
168
+* rs/wt-status-cleanup (2017-07-10) 1 commit
169
+ (merged to 'next' on 2017-07-10 at d8939f683a)
170
+ + wt-status: use separate variable for result of shorten_unambiguous_ref
171
122
- Update the character width tables.
172
+ Code cleanup.
173
+
174
+ Will merge to 'master'.
175
+
176
+
177
+* ks/prepare-commit-msg-sample (2017-07-10) 3 commits
178
+ - hook: add sign-off using "interpret-trailers"
179
+ - hook: name the positional variables
180
+ - hook: cleanup script
181
+
182
+ Remove an example that is now obsolete from a sample hook,
183
+ and improve an old example in it that added a sign-off manually
184
+ to use the interpret-trailers command.
185
+
186
+
187
+* jk/build-with-asan (2017-07-10) 5 commits
188
+ (merged to 'next' on 2017-07-10 at 49757e1119)
189
+ + Makefile: disable unaligned loads with UBSan
190
+ + Makefile: turn off -fomit-frame-pointer with sanitizers
191
+ + Makefile: add helper for compiling with -fsanitize
192
+ + test-lib: turn on ASan abort_on_error by default
193
+ + test-lib: set ASAN_OPTIONS variable before we run git
194
+
195
+ The build procedure has been improved to allow building and testing
196
+ Git with address sanitizer more easily.
197
+
198
+ Will merge to 'master'.
199
+
200
+
201
+* ks/fix-rebase-doc-picture (2017-07-10) 1 commit
202
+ (merged to 'next' on 2017-07-10 at 3acb856b17)
203
+ + doc: correct a mistake in an illustration
204
+
205
+ Doc update.
206
207
Will merge to 'master'.
208
@@ -189,6 +272,19 @@ of the repositories listed at
272
--------------------------------------------------
273
[Cooking]
274
275
+* jc/allow-lazy-cas (2017-07-06) 1 commit
276
+ - push: disable lazy --force-with-lease by default
277
+
278
+ Because "git push --force-with-lease[=<ref>]" that relies on the
279
+ stability of remote-tracking branches is unsafe when something
280
+ fetches into the repository behind user's back, it is now disabled
281
+ by default. A new configuration variable can be used to enable it
282
+ by users who know what they are doing. This would pave the way to
283
+ possibly turn `--force` into `--force-with-lease`.
284
+
285
+ Will wait for feedback, then merge to and cook in 'next'.
286
+
287
+
288
* bc/object-id (2017-07-04) 12 commits
289
- sha1_name: convert GET_SHA1* flags to GET_OID*
290
- sha1_name: convert get_sha1* to get_oid*
@@ -205,39 +301,26 @@ of the repositories listed at
301
302
Conversion from uchar[20] to struct object_id continues.
303
304
+ Expecting a reroll.
305
+ cf. <20170707212201.ofdgjaips2tw3koy@genre.crustytoothpaste.net>
306
+
307
209
-* jk/reflog-walk (2017-07-07) 8 commits
210
- - reflog-walk: apply --since/--until to reflog dates
211
- - reflog-walk: stop using fake parents
212
- - rev-list: check reflog_info before showing usage
213
- - get_revision_1(): replace do-while with an early return
214
- - log: do not free parents when walking reflog
215
- - revision: disallow reflog walking with revs->limited
216
- - t1414: document some reflog-walk oddities
217
- - Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk
218
- (this branch uses jk/reflog-walk-maint.)
308
+* jk/reflog-walk (2017-07-09) 9 commits
309
+ (merged to 'next' on 2017-07-09 at 7449e964c6)
310
+ + reflog-walk: apply --since/--until to reflog dates
311
+ + reflog-walk: stop using fake parents
312
+ + rev-list: check reflog_info before showing usage
313
+ + get_revision_1(): replace do-while with an early return
314
+ + log: do not free parents when walking reflog
315
+ + log: clarify comment about reflog cycles
316
+ + revision: disallow reflog walking with revs->limited
317
+ + t1414: document some reflog-walk oddities
318
+ + Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk
319
320
Numerous bugs in walking of reflogs via "log -g" and friends have
321
been fixed.
322
223
- Will wait for feedback, then merge to and cook in 'next'.
224
-
225
-
226
-* jk/reflog-walk-maint (2017-07-07) 4 commits
227
- (merged to 'next' on 2017-07-07 at 611554ba2f)
228
- + reflog-walk: include all fields when freeing complete_reflogs
229
- + reflog-walk: don't free reflogs added to cache
230
- + reflog-walk: duplicate strings in complete_reflogs list
231
- (merged to 'next' on 2017-07-06 at 7408dd80a1)
232
- + reflog-walk: skip over double-null oid due to HEAD rename
233
- (this branch is used by jk/reflog-walk.)
234
-
235
- After "git branch --move" of the currently checked out branch, the
236
- code to walk the reflog of HEAD via "log -g" and friends
237
- incorrectly stopped at the reflog entry that records the renaming
238
- of the branch.
239
-
240
- Will merge to 'master'.
323
+ Will cook in 'next'.
324
325
326
* sb/hashmap-cleanup (2017-07-05) 10 commits
@@ -260,7 +343,7 @@ of the repositories listed at
343
The callback implementations have been updated to take "void *"
344
pointers and cast them to the type they expect instead.
345
263
- Will wait for feedback, then merge to and cook in 'next'.
346
+ Will merge to 'next'.
347
348
349
* tb/push-to-cygwin-unc-path (2017-07-05) 1 commit
@@ -276,7 +359,7 @@ of the repositories listed at
359
not just the code to decide if the push destination is local. There
360
may be unexpected fallouts in the path normalization.
361
279
- Will wait for feedback, then merge to and cook in 'next'.
362
+ Will merge to 'next'.
363
364
365
* ab/grep-lose-opt-regflags (2017-06-30) 6 commits
@@ -293,17 +376,6 @@ of the repositories listed at
376
Will merge to 'master'.
377
378
296
-* ks/commit-assuming-only-warning-removal (2017-06-30) 2 commits
297
- (merged to 'next' on 2017-07-05 at 462a72df95)
298
- + commit-template: distinguish status information unconditionally
299
- + commit-template: remove outdated notice about explicit paths
300
-
301
- An old message shown in the commit log template was removed, as it
302
- has outlived its usefulness.
303
-
304
- Will merge to 'master'.
305
-
306
-
379
* sb/hashmap-customize-comparison (2017-06-30) 3 commits
380
(merged to 'next' on 2017-07-06 at cc420805f3)
381
+ hashmap: migrate documentation from Documentation/technical into header
@@ -328,24 +400,6 @@ of the repositories listed at
400
It still seems to break when merged to 'pu'.
401
402
331
-* rs/free-and-null (2017-06-29) 1 commit
332
- (merged to 'next' on 2017-07-06 at 9c9e1d59a2)
333
- + coccinelle: polish FREE_AND_NULL rules
334
-
335
- Code cleanup.
336
-
337
- Will merge to 'master'.
338
-
339
-
340
-* ab/wildmatch (2017-06-23) 1 commit
341
- (merged to 'next' on 2017-07-07 at 34482a9a4f)
342
- + wildmatch: remove unused wildopts parameter
343
-
344
- Minor code cleanup.
345
-
346
- Will merge to 'master'.
347
-
348
-
403
* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
404
(merged to 'next' on 2017-06-26 at d026281517)
405
+ pathspec: die on empty strings as pathspec
@@ -363,26 +417,15 @@ of the repositories listed at
417
418
419
* sb/pull-rebase-submodule (2017-06-27) 4 commits
366
- - builtin/fetch cleanup: always set default value for submodule recursing
367
- - pull: optionally rebase submodules (remote submodule changes only)
368
- - builtin/fetch: parse recurse-submodules-default at default options parsing
369
- - builtin/fetch: factor submodule recurse parsing out to submodule config
420
+ (merged to 'next' on 2017-07-09 at 48d2c3a51c)
421
+ + builtin/fetch cleanup: always set default value for submodule recursing
422
+ + pull: optionally rebase submodules (remote submodule changes only)
423
+ + builtin/fetch: parse recurse-submodules-default at default options parsing
424
+ + builtin/fetch: factor submodule recurse parsing out to submodule config
425
426
"git pull --rebase --recurse-submodules" learns to rebase the
427
branch in the submodules to an updated base.
428
374
- Will merge to 'next'.
375
-
376
-
377
-* pw/unquote-path-in-git-pm (2017-06-30) 4 commits
378
- (merged to 'next' on 2017-07-05 at 538ab4d599)
379
- + t9700: add tests for Git::unquote_path()
380
- + Git::unquote_path(): throw an exception on bad path
381
- + Git::unquote_path(): handle '\a'
382
- + add -i: move unquote_path() to Git.pm
383
-
384
- Code refactoring.
385
-
429
Will merge to 'master'.
430
431
@@ -425,11 +468,12 @@ of the repositories listed at
468
469
470
* sb/submodule-doc (2017-06-22) 1 commit
428
- - submodules: overhaul documentation
471
+ (merged to 'next' on 2017-07-09 at fda0ceec31)
472
+ + submodules: overhaul documentation
473
474
Doc update.
475
432
- Will merge to 'next'.
476
+ Will merge to 'master'.
477
478
479
* sd/branch-copy (2017-06-18) 3 commits
@@ -464,18 +508,6 @@ of the repositories listed at
508
Will merge to 'master'.
509
510
467
-* ab/sha1dc (2017-07-03) 2 commits
468
- (merged to 'next' on 2017-07-06 at 5a783032b7)
469
- + sha1collisiondetection: automatically enable when submodule is populated
470
- + sha1dc: optionally use sha1collisiondetection as a submodule
471
-
472
- The "collission-detecting" implementation of SHA-1 hash we borrowed
473
- from is replaced by directly binding the upstream project as our
474
- submodule. Glitches on minority platforms are still being worked out.
475
-
476
- Will merge to 'master'.
477
-
478
-
511
* bp/fsmonitor (2017-06-12) 6 commits
512
- fsmonitor: add a sample query-fsmonitor hook script for Watchman
513
- fsmonitor: add documentation for the fsmonitor extension.