What's cooking (2017/05 #07)
Junio C Hamano committed
May 23, 2017 at 16:59 UTC
bdfe69ee51e6df8df518953fdf65dcac5359495c
1 file changed
+407
-327
whats-cooking.txt
+407
-327
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2017, #06; Mon, 22)
4
-X-master-at: 10c78a162fa821ee85203165b805ff46be454091
5
-X-next-at: 20371eebb69346345f908fea7f7cbd2909a91c2c
3
+Subject: What's cooking in git.git (May 2017, #07; Tue, 23)
4
+X-master-at: 1eb437020a2c098a7c12da4c05082fbea10d98c9
5
+X-next-at: 93fb34087a286d99fc95933e0bb699d6263fbad7
6
7
-What's cooking in git.git (May 2017, #06; Mon, 22)
7
+What's cooking in git.git (May 2017, #07; Tue, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,21 +12,211 @@ 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
-The tip of 'next' has been rewound, and the first batch of topics
16
-for the next release have been merged to 'master'. I tentatively
17
-wrote doen that this cycle will last for 11 weeks, completing at the
18
-end of July.
15
+The 'maint' branch is now for the v2.13.x maintenance track. A
16
+handful of fixes in 'master' will soon be merged to it to prepare
17
+for v2.13.1 in a week or so.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
21
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
+--------------------------------------------------
25
+[Graduated to "master"]
26
+
27
+* ab/doc-replace-gmane-links (2017-05-09) 2 commits
28
+ (merged to 'next' on 2017-05-20 at 2c4f96560c)
29
+ + doc: replace more gmane links
30
+ + doc: replace a couple of broken gmane links
31
+
32
+ The Web interface to gmane news archive is long gone, even though
33
+ the articles are still accessible via NTTP. Replace the links with
34
+ ones to public-inbox.org. Because their message identification is
35
+ based on the actual message-id, it is likely that it will be easier
36
+ to migrate away from it if/when necessary.
37
+
38
+
39
+* ab/fix-poison-tests (2017-05-11) 3 commits
40
+ (merged to 'next' on 2017-05-20 at 5b13ba86bd)
41
+ + travis-ci: add job to run tests with GETTEXT_POISON
42
+ + travis-ci: setup "prove cache" in "script" step
43
+ + tests: fix tests broken under GETTEXT_POISON=YesPlease
44
+
45
+ Update tests to pass under GETTEXT_POISON (a mechanism to ensure
46
+ that output strings that should not be translated are not
47
+ translated by mistake), and tell TravisCI to run them.
48
+
49
+
50
+* ah/log-decorate-default-to-auto (2017-05-15) 1 commit
51
+ (merged to 'next' on 2017-05-20 at 209614479c)
52
+ + builtin/log: honor log.decorate
53
+
54
+ Setting "log.decorate=false" in the configuration file did not take
55
+ effect in v2.13, which has been corrected.
56
+
57
+
58
+* bw/submodule-with-bs-path (2017-05-01) 1 commit
59
+ (merged to 'next' on 2017-05-20 at b740f784cb)
60
+ + t7400: add !CYGWIN prerequisite to 'add with \\ in path'
61
+
62
+ A hotfix to a topic that is already in v2.13.
63
+
64
+
65
+* jt/push-options-doc (2017-05-10) 2 commits
66
+ (merged to 'next' on 2017-05-20 at ca7f344111)
67
+ + receive-pack: verify push options in cert
68
+ + docs: correct receive.advertisePushOptions default
69
+
70
+ The receive-pack program now makes sure that the push certificate
71
+ records the same set of push options used for pushing.
72
+
73
+
74
+* ls/travis-relays-for-windows-ci (2017-05-04) 2 commits
75
+ (merged to 'next' on 2017-05-20 at 47f34b78e2)
76
+ + travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503
77
+ + travis-ci: handle Git for Windows CI status "failed" explicitly
78
+
79
+ Will merge to 'master'.
80
+
81
+
82
+* rs/checkout-am-fix-unborn (2017-05-08) 2 commits
83
+ (merged to 'next' on 2017-05-20 at d4f1ee3ed7)
84
+ + am: check return value of resolve_refdup before using hash
85
+ + checkout: check return value of resolve_refdup before using hash
86
+
87
+ A few codepaths in "checkout" and "am" working on an unborn branch
88
+ tried to access an uninitialized piece of memory.
89
+
90
+
91
+* tb/dedup-crlf-tests (2017-05-10) 1 commit
92
+ (merged to 'next' on 2017-05-20 at 0a7ffff154)
93
+ + t0027: tests are not expensive; remove t0025
94
+
95
+ Will merge to 'master'.
96
+
97
--------------------------------------------------
98
[New Topics]
99
100
+* ah/doc-interpret-trailers-ifexists (2017-05-23) 1 commit
101
+ - Documentation: fix reference to ifExists for interpret-trailers
102
+
103
+ Documentation fix.
104
+
105
+ Will merge to 'next'.
106
+
107
+
108
+* ah/doc-pretty-format-fix (2017-05-23) 1 commit
109
+ - Documentation: fix formatting typo in pretty-formats.txt
110
+
111
+ Documentation fix.
112
+
113
+ Will merge to 'next'.
114
+
115
+
116
+* sb/submodule-blanket-recursive (2017-05-23) 6 commits
117
+ . builtin/push.c: respect 'submodule.recurse' option
118
+ . builtin/grep.c: respect 'submodule.recurse' option
119
+ . builtin/fetch.c: respect 'submodule.recurse' option
120
+ . Introduce submodule.recurse option for worktree manipulators
121
+ . submodule test invocation: only pass additional arguments
122
+ . submodule.c: add has_submodules to check if we have any submodules
123
+ (this branch uses sb/reset-recurse-submodules.)
124
+
125
+ A new configuration variable "submodule.recurse" can be set to true
126
+ to force various commands run at the top-level superproject to
127
+ behave as if they were invoked with the "--recurse-submodules"
128
+ option.
129
+
130
+ Seems to break t7814 when merged to 'pu'.
131
+
132
+
133
+* sb/t5531-update-desc (2017-05-23) 1 commit
134
+ - t5531: fix test description
135
+
136
+ The description strings for a few tests have been updated.
137
+
138
+ Will merge to 'next'.
139
+
140
+--------------------------------------------------
141
+[Stalled]
142
+
143
+* mg/status-in-progress-info (2017-05-10) 2 commits
144
+ - status --short --inprogress: spell it as --in-progress
145
+ - status: show in-progress info for short status
146
+
147
+ "git status" learns an option to report various operations
148
+ (e.g. "merging") that the user is in the middle of.
149
+
150
+ cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
151
+
152
+
153
+* mg/name-rev-debug (2017-03-31) 2 commits
154
+ - describe: pass --debug down to name-rev
155
+ - name-rev: provide debug output
156
+ (this branch uses jc/name-rev-lw-tag.)
157
+
158
+ "git describe --debug --contains" did not add any meaningful
159
+ information, even though without "--contains" it did.
160
+
161
+
162
+* nd/worktree-move (2017-04-20) 6 commits
163
+ - worktree remove: new command
164
+ - worktree move: refuse to move worktrees with submodules
165
+ - worktree move: accept destination as directory
166
+ - worktree move: new command
167
+ - worktree.c: add update_worktree_location()
168
+ - worktree.c: add validate_worktree()
169
+
170
+ "git worktree" learned move and remove subcommands.
171
+
172
+ Expecting a reroll.
173
+ cf. <20170420101024.7593-1-pclouds@gmail.com>
174
+ cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
175
+ cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
176
+
177
+
178
+* df/dir-iter-remove-subtree (2017-04-19) 5 commits
179
+ - remove_subtree(): reimplement using iterators
180
+ - dir_iterator: rewrite state machine model
181
+ - dir_iterator: refactor dir_iterator_advance
182
+ - remove_subtree(): test removing nested directories
183
+ - dir_iterator: add tests for dir_iterator API
184
+
185
+ Update the dir-iterator API and use it to reimplement
186
+ remove_subtree().
187
+
188
+ A reroll exists that is based on the updated 'master', but I ran
189
+ out of time trying to get it to work with other topics in flight
190
+ in 'pu'.
191
+ GSoC microproject.
192
+
193
+
194
+* ls/filter-process-delayed (2017-03-06) 1 commit
195
+ - convert: add "status=delayed" to filter process protocol
196
+
197
+ Expecting a reroll.
198
+ cf. <04ECEBE5-CAC8-4344-B07A-6B7A7C795C94@gmail.com>
199
+
200
+
201
+* sk/dash-is-previous (2017-03-01) 5 commits
202
+ - revert.c: delegate handling of "-" shorthand to setup_revisions
203
+ - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
204
+ - revision.c: args starting with "-" might be a revision
205
+ - revision.c: swap if/else blocks
206
+ - revision.c: do not update argv with unknown option
207
+
208
+ A dash "-" can be written to mean "the branch that was previously
209
+ checked out" in more places.
210
+
211
+ Needs review.
212
+ cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
213
+
214
+--------------------------------------------------
215
+[Cooking]
216
+
217
* ab/conditional-config-with-symlinks (2017-05-17) 1 commit
29
- - config: match both symlink & realpath versions in IncludeIf.gitdir:*
218
+ (merged to 'next' on 2017-05-23 at 6162222c2e)
219
+ + config: match both symlink & realpath versions in IncludeIf.gitdir:*
220
221
The recently introduced "[includeIf "gitdir:$dir"] path=..."
222
mechansim has further been taught to take symlinks into account.
@@ -36,11 +226,12 @@ of the repositories listed at
226
current repository to determine if the contents from the named path
227
should be included.
228
39
- Will merge to 'next'.
229
+ Will merge to 'master'.
230
231
232
* bm/interpret-trailers-cut-line-is-eom (2017-05-18) 1 commit
43
- - interpret-trailers: honor the cut line
233
+ (merged to 'next' on 2017-05-23 at 3e5ff08517)
234
+ + interpret-trailers: honor the cut line
235
236
"git interpret-trailers", when used as GIT_EDITOR for "git commit
237
-v", looked for and appended to a trailer block at the very end,
@@ -48,23 +239,25 @@ of the repositories listed at
239
corrected to pay attention to the cut-mark line "commit -v" adds to
240
the buffer---the real trailer block should appear just before it.
241
51
- Will merge to 'next'.
242
+ Will merge to 'master'.
243
244
245
* jc/skip-test-in-the-middle (2017-05-18) 2 commits
55
- - t5545: enhance test coverage when no http server is installed
56
- - test: allow skipping the remainder
246
+ (merged to 'next' on 2017-05-23 at 6c962b353b)
247
+ + t5545: enhance test coverage when no http server is installed
248
+ + test: allow skipping the remainder
249
250
A recent update to t5545-push-options.sh started skipping all the
251
tests in the script when a web server testing is disabled or
252
unavailable, not just the ones that require a web server. Non HTTP
253
tests have been salvaged to always run in this script.
254
63
- Will merge to 'next'.
255
+ Will merge to 'master'.
256
257
258
* jk/alternate-ref-optim (2017-05-18) 1 commit
67
- - t5400: avoid concurrent writes into a trace file
259
+ (merged to 'next' on 2017-05-23 at 4b4b3ac463)
260
+ + t5400: avoid concurrent writes into a trace file
261
262
A test allowed both "git push" and "git receive-pack" on the other
263
end write their traces into the same file. This is OK on platforms
@@ -73,10 +266,10 @@ of the repositories listed at
266
intermittent test failures. This has been fixed by disabling
267
traces from "receive-pack" in the test.
268
76
- Will merge to 'next'.
269
+ Will merge to 'master'.
270
271
79
-* mh/packed-ref-store-prep (2017-05-18) 23 commits
272
+* mh/packed-ref-store-prep (2017-05-23) 26 commits
273
- cache_ref_iterator_begin(): avoid priming unneeded directories
274
- ref-filter: limit traversal to prefix
275
- create_ref_entry(): remove `check_name` option
@@ -88,23 +281,27 @@ of the repositories listed at
281
- ref_update_reject_duplicates(): add a sanity check
282
- ref_update_reject_duplicates(): use `size_t` rather than `int`
283
- ref_update_reject_duplicates(): expose function to whole refs module
91
- - ref_transaction_commit(): break into multiple functions
284
+ - ref_transaction_prepare(): new optional step for reference updates
285
+ - ref_transaction_commit(): check for valid `transaction->state`
286
- files_transaction_cleanup(): new helper function
287
- files_ref_store: put the packed files lock directly in this struct
288
- files-backend: move `lock` member to `files_ref_store`
289
- lockfile: add a new method, is_lock_file_locked()
96
- - ref_store: take `logmsg` parameter when deleting references
290
+ - ref_store: take a `msg` parameter when deleting references
291
- refs: use `size_t` indexes when iterating over ref transaction updates
292
- refs_ref_iterator_begin(): don't check prefixes redundantly
293
- prefix_ref_iterator: don't trim too much
294
+ - files-backend: use `die("BUG: ...")`, not `die("internal error: ...")`
295
- ref_iterator_begin_fn(): fix docstring
296
- refs.h: clarify docstring for the ref_transaction_update()-related fns
297
- t3600: clean up permissions test properly
298
+ - Merge branch 'bc/object-id'
299
+ (this branch uses bc/object-id.)
300
301
The implementation of "ref" API around the "packed refs" have been
302
cleaned up, in preparation for further changes.
303
107
- Expecting a reroll.
304
+ Will merge to 'next'.
305
306
307
* sl/clean-d-ignored-fix (2017-05-22) 7 commits
@@ -120,14 +317,18 @@ of the repositories listed at
317
even though the command should not lose ignored ones without "-x".
318
This has been corrected.
319
320
+ Expecting a reroll.
321
+ cf. <xmqq1srgko52.fsf@gitster.mtv.corp.google.com>
322
+
323
324
* tg/stash-push-fixup (2017-05-17) 1 commit
125
- - completion: add git stash push
325
+ (merged to 'next' on 2017-05-23 at 338eb650f2)
326
+ + completion: add git stash push
327
328
The shell completion script (in contrib/) learned "git stash" has
329
a new "push" subcommand.
330
130
- Will merge to 'next'.
331
+ Will merge to 'master'.
332
333
334
* ab/sha1dc (2017-05-22) 3 commits
@@ -156,21 +357,23 @@ of the repositories listed at
357
- dir: make lookup_untracked() available outside of dir.c
358
- bswap: add 64 bit endianness helper get_be64
359
159
- Expecting reroll.
360
+ Expecting a reroll.
361
362
363
* dk/send-email-avoid-net-smtp-ssl-when-able (2017-05-20) 1 commit
163
- - send-email: Net::SMTP::SSL is obsolete, use only when necessary
364
+ (merged to 'next' on 2017-05-23 at fc59b8a1d4)
365
+ + send-email: Net::SMTP::SSL is obsolete, use only when necessary
366
367
"git send-email" now uses Net::SMTP::SSL, which is obsolete, only
368
when needed. Recent versions of Net::SMTP can do TLS natively.
369
168
- Will merge to 'next'.
370
+ Will merge to 'master'.
371
372
373
* jc/name-rev-lw-tag (2017-03-29) 2 commits
172
- - name-rev: favor describing with tags and use committer date to tiebreak
173
- - name-rev: refactor logic to see if a new candidate is a better name
374
+ (merged to 'next' on 2017-05-23 at 3f88b6d73c)
375
+ + name-rev: favor describing with tags and use committer date to tiebreak
376
+ + name-rev: refactor logic to see if a new candidate is a better name
377
(this branch is used by mg/name-rev-debug.)
378
379
"git describe --contains" penalized light-weight tags so much that
@@ -178,7 +381,7 @@ of the repositories listed at
381
same chance to be considered as an annotated tag that is the same
382
age as the underlying commit would.
383
181
- Will merge to 'next'.
384
+ Will merge to 'master'.
385
386
387
* jk/diff-blob (2017-05-20) 15 commits
@@ -207,192 +410,114 @@ of the repositories listed at
410
411
412
* jk/ignore-broken-tags-when-ignoring-missing-links (2017-05-20) 1 commit
210
- - revision.c: ignore broken tags with ignore_missing_links
413
+ (merged to 'next' on 2017-05-23 at 977491e52a)
414
+ + revision.c: ignore broken tags with ignore_missing_links
415
416
Tag objects, which are not reachable from any ref, that point at
417
missing objects were mishandled by "git gc" and friends (they
418
should silently be ignored instead)
215
-
216
- Will merge to 'next'.
419
+
420
+ Will merge to 'master'.
421
422
423
* js/bs-is-a-dir-sep-on-windows (2017-05-20) 2 commits
220
- - Windows: do not treat a path with backslashes as a remote's nick name
221
- - mingw.h: permit arguments with side effects for is_dir_sep
424
+ (merged to 'next' on 2017-05-23 at e27040ceb0)
425
+ + Windows: do not treat a path with backslashes as a remote's nick name
426
+ + mingw.h: permit arguments with side effects for is_dir_sep
427
428
"foo\bar\baz" in "git fetch foo\bar\baz", even though there is no
429
slashes in it, cannot be a nickname for a remote on Windows, as
430
that is likely to be a pathname on a local filesystem.
431
227
- Will merge to 'next'.
432
+ Will merge to 'master'.
433
434
435
* js/larger-timestamps (2017-05-20) 1 commit
231
- - name-rev: change a "long" variable to timestamp_t
436
+ (merged to 'next' on 2017-05-23 at 16f7c9e677)
437
+ + name-rev: change a "long" variable to timestamp_t
438
439
A follow-up hotfix for a topic already in 'master'.
440
235
- Will merge to 'next'.
441
+ Will merge to 'master'.
442
443
444
* km/log-showsignature-doc (2017-05-20) 1 commit
239
- - config.txt: add an entry for log.showSignature
445
+ (merged to 'next' on 2017-05-23 at f43ea11956)
446
+ + config.txt: add an entry for log.showSignature
447
241
- Will merge to 'next'.
448
+ Will merge to 'master'.
449
450
451
* kn/ref-filter-branch-list (2017-05-20) 1 commit
245
- - ref-filter: resolve HEAD when parsing %(HEAD) atom
452
+ (merged to 'next' on 2017-05-23 at e0cc721af0)
453
+ + ref-filter: resolve HEAD when parsing %(HEAD) atom
454
455
"git for-each-ref --format=..." with %(HEAD) in the format used to
456
resolve the HEAD symref as many times as it had processed refs,
457
which was wasteful, and "git branch" shared the same problem.
458
251
- Will merge to 'next'.
459
+ Will merge to 'master'.
460
461
462
* pw/rebase-i-regression-fix (2017-05-20) 3 commits
255
- - rebase -i: add missing newline to end of message
256
- - rebase -i: silence stash apply
257
- - rebase -i: fix reflog message
463
+ (merged to 'next' on 2017-05-23 at 14676d0013)
464
+ + rebase -i: add missing newline to end of message
465
+ + rebase -i: silence stash apply
466
+ + rebase -i: fix reflog message
467
468
Regression fix to topic recently merged to 'master'.
469
261
- Will merge to 'next'.
470
+ Will merge to 'master'.
471
472
264
-* sb/diff-color-move (2017-05-20) 20 commits
265
- - diff.c: color moved lines differently
266
- - diff: buffer all output if asked to
267
- - diff.c: emit_line includes whitespace highlighting
268
- - diff.c: convert diff_summary to use emit_line_*
269
- - diff.c: convert diff_flush to use emit_line_*
270
- - diff.c: convert word diffing to use emit_line_*
271
- - diff.c: convert show_stats to use emit_line_*
272
- - diff.c: convert emit_binary_diff_body to use emit_line_*
273
- - submodule.c: convert show_submodule_summary to use emit_line_fmt
274
- - diff.c: convert emit_rewrite_lines to use emit_line_*
275
- - diff.c: convert emit_rewrite_diff to use emit_line_*
276
- - diff.c: convert builtin_diff to use emit_line_*
277
- - diff.c: convert fn_out_consume to use emit_line
278
- - diff.c: inline emit_line_0 into emit_line
279
- - diff.c: emit_line_0 takes parameter whether to output line prefix
280
- - diff.c: emit_line_0 can handle no color setting
281
- - diff.c: teach emit_line_0 to accept sign parameter
282
- - diff.c: factor out diff_flush_patch_all_file_pairs
283
- - diff: move line ending check into emit_hunk_header
284
- - diff: readability fix
473
+* sb/diff-color-move (2017-05-23) 17 commits
474
+ . diff.c: color moved lines differently
475
+ . diff: buffer all output if asked to
476
+ . diff.c: emit_line includes whitespace highlighting
477
+ . diff.c: convert diff_summary to use emit_line_*
478
+ . diff.c: convert diff_flush to use emit_line_*
479
+ . diff.c: convert word diffing to use emit_line_*
480
+ . diff.c: convert show_stats to use emit_line_*
481
+ . diff.c: convert emit_binary_diff_body to use emit_line_*
482
+ . submodule.c: convert show_submodule_summary to use emit_line_fmt
483
+ . diff.c: convert emit_rewrite_lines to use emit_line_*
484
+ . diff.c: convert emit_rewrite_diff to use emit_line_*
485
+ . diff.c: convert builtin_diff to use emit_line_*
486
+ . diff.c: convert fn_out_consume to use emit_line
487
+ . diff: introduce more flexible emit function
488
+ . diff.c: factor out diff_flush_patch_all_file_pairs
489
+ . diff: move line ending check into emit_hunk_header
490
+ . diff: readability fix
491
492
"git diff" has been taught to optionally paint new lines that are
493
the same as deleted lines elsewhere differently from genuinely new
494
lines.
495
496
+ Seems to break t4060 when merged to 'next'.
497
291
-* xz/send-email-batch-size (2017-05-22) 2 commits
292
- - SQUASH???
498
+
499
+* xz/send-email-batch-size (2017-05-23) 1 commit
500
- send-email: --batch-size to work around some SMTP server limit
501
502
"git send-email" learned to overcome some SMTP server limitation
503
that does not allow many pieces of e-mails to be sent over a single
504
session.
505
299
-
300
---------------------------------------------------
301
-[Stalled]
302
-
303
-* mg/status-in-progress-info (2017-05-10) 2 commits
304
- - status --short --inprogress: spell it as --in-progress
305
- - status: show in-progress info for short status
306
-
307
- "git status" learns an option to report various operations
308
- (e.g. "merging") that the user is in the middle of.
309
-
310
- cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
311
-
312
-
313
-* mg/name-rev-debug (2017-03-31) 2 commits
314
- - describe: pass --debug down to name-rev
315
- - name-rev: provide debug output
316
- (this branch uses jc/name-rev-lw-tag.)
317
-
318
- "git describe --debug --contains" did not add any meaningful
319
- information, even though without "--contains" it did.
320
-
321
-
322
-* nd/worktree-move (2017-04-20) 6 commits
323
- - worktree remove: new command
324
- - worktree move: refuse to move worktrees with submodules
325
- - worktree move: accept destination as directory
326
- - worktree move: new command
327
- - worktree.c: add update_worktree_location()
328
- - worktree.c: add validate_worktree()
329
-
330
- "git worktree" learned move and remove subcommands.
331
-
332
- Expecting a reroll.
333
- cf. <20170420101024.7593-1-pclouds@gmail.com>
334
- cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
335
- cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
336
-
337
-
338
-* df/dir-iter-remove-subtree (2017-04-19) 5 commits
339
- - remove_subtree(): reimplement using iterators
340
- - dir_iterator: rewrite state machine model
341
- - dir_iterator: refactor dir_iterator_advance
342
- - remove_subtree(): test removing nested directories
343
- - dir_iterator: add tests for dir_iterator API
344
-
345
- Update the dir-iterator API and use it to reimplement
346
- remove_subtree().
347
-
348
- A reroll exists that is based on the updated 'master', but I ran
349
- out of time trying to get it to work with other topics in flight
350
- in 'pu'.
351
- GSoC microproject.
352
-
353
-
354
-* ls/filter-process-delayed (2017-03-06) 1 commit
355
- - convert: add "status=delayed" to filter process protocol
356
-
357
- Expecting a reroll.
358
-
359
-
360
-* sk/dash-is-previous (2017-03-01) 5 commits
361
- - revert.c: delegate handling of "-" shorthand to setup_revisions
362
- - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
363
- - revision.c: args starting with "-" might be a revision
364
- - revision.c: swap if/else blocks
365
- - revision.c: do not update argv with unknown option
366
-
367
- A dash "-" can be written to mean "the branch that was previously
368
- checked out" in more places.
369
-
370
- Needs review.
371
- cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
372
-
373
---------------------------------------------------
374
-[Cooking]
375
-
376
-* ah/log-decorate-default-to-auto (2017-05-15) 1 commit
377
- (merged to 'next' on 2017-05-20 at 209614479c)
378
- + builtin/log: honor log.decorate
379
-
380
- Setting "log.decorate=false" in the configuration file did not take
381
- effect in v2.13, which has been corrected.
382
-
383
- Will merge to 'master'.
506
+ Waiting for response.
507
+ cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>
508
509
510
* jh/memihash-opt (2017-05-16) 5 commits
387
- - p0004: don't error out if test repo is too small
388
- - p0004: don't abort if multi-threaded is too slow
389
- - p0004: use test_perf
390
- - p0004: avoid using pipes
391
- - p0004: simplify calls of test-lazy-init-name-hash
511
+ (merged to 'next' on 2017-05-23 at 2f0293e8b8)
512
+ + p0004: don't error out if test repo is too small
513
+ + p0004: don't abort if multi-threaded is too slow
514
+ + p0004: use test_perf
515
+ + p0004: avoid using pipes
516
+ + p0004: simplify calls of test-lazy-init-name-hash
517
518
perf-test update.
519
395
- Will merge to 'next'.
520
+ Will merge to 'master'.
521
522
523
* jk/bug-to-abort (2017-05-22) 4 commits
@@ -408,20 +533,14 @@ of the repositories listed at
533
Will merge to 'master'.
534
535
411
-* jk/no-looking-at-dotgit-outside-repo (2017-05-15) 1 commit
412
- - config: complain about --local outside of a git repo
413
-
414
- Will discard.
415
- Superseded by jk/bug-to-abort.
416
-
417
-
536
* jk/update-links-in-docs (2017-05-15) 1 commit
419
- - doc: use https links to Wikipedia to avoid http redirects
537
+ (merged to 'next' on 2017-05-23 at 5b2df9fdbe)
538
+ + doc: use https links to Wikipedia to avoid http redirects
539
540
A few http:// links that are redirected to https:// in the
541
documentation have been updated to https:// links.
542
424
- Will merge to 'next'.
543
+ Will merge to 'master'.
544
545
546
* js/blame-lib (2017-05-15) 22 commits
@@ -451,38 +570,48 @@ of the repositories listed at
570
The internal logic used in "git blame" has been libified to make it
571
easier to use by cgit.
572
573
+ RFC, and is hard to review due to renaming of symbols and moving of
574
+ lines across files are intermixed but I think the overall direction
575
+ is a good one.
576
+
577
+ Expecting a rerolled non-RFC series.
578
+ cf. <20170514031513.9042-1-whydoubt@gmail.com>
579
+
580
581
* jt/send-email-validate-hook (2017-05-16) 1 commit
456
- - send-email: support validate hook
582
+ (merged to 'next' on 2017-05-23 at 89848cb9ac)
583
+ + send-email: support validate hook
584
585
"git send-email" learned to run sendemail-validate hook to inspect
586
and reject a message before sending it out.
587
461
- Will merge to 'next'.
588
+ Will merge to 'master'.
589
590
591
* bw/pathspec-sans-the-index (2017-05-12) 6 commits
465
- - pathspec: convert find_pathspecs_matching_against_index to take an index
466
- - pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
467
- - ls-files: prevent prune_cache from overeagerly pruning submodules
468
- - pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag
469
- - submodule: add die_in_unpopulated_submodule function
470
- - pathspec: provide a more descriptive die message
592
+ (merged to 'next' on 2017-05-23 at 45c8ef3115)
593
+ + pathspec: convert find_pathspecs_matching_against_index to take an index
594
+ + pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
595
+ + ls-files: prevent prune_cache from overeagerly pruning submodules
596
+ + pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag
597
+ + submodule: add die_in_unpopulated_submodule function
598
+ + pathspec: provide a more descriptive die message
599
600
Simplify parse_pathspec() codepath and stop it from looking at the
601
default in-core index.
602
475
- Will merge to 'next'.
603
+ Will merge to 'master'.
604
605
606
* jt/fetch-allow-tip-sha1-implicitly (2017-05-16) 1 commit
479
- - fetch-pack: always allow fetching of literal SHA1s
607
+ (merged to 'next' on 2017-05-23 at 690ed987df)
608
+ + fetch-pack: always allow fetching of literal SHA1s
609
610
There is no good reason why "git fetch $there $sha1" should fail
611
when the $sha1 names an object at the tip of an advertised ref,
612
even when the other side hasn't enabled allowTipSHA1InWant.
613
485
- Will merge to 'next'.
614
+ Will merge to 'master'.
615
616
617
* jc/read-tree-empty-with-m (2017-05-10) 1 commit
@@ -498,47 +627,26 @@ of the repositories listed at
627
628
629
* ab/perf-wildmatch (2017-05-12) 2 commits
501
- - perf: add test showing exponential growth in path globbing
502
- - perf: add function to setup a fresh test repo
630
+ (merged to 'next' on 2017-05-23 at 0adb7dac31)
631
+ + perf: add test showing exponential growth in path globbing
632
+ + perf: add function to setup a fresh test repo
633
634
Add perf-test for wildmatch.
635
506
- Will merge to 'next'.
636
+ Will merge to 'master'.
637
638
639
* jk/doc-config-include (2017-05-12) 4 commits
510
- - docs/config: consistify include.path examples
511
- - docs/config: avoid the term "expand" for includes
512
- - docs/config: give a relative includeIf example
513
- - docs/config: clarify include/includeIf relationship
640
+ (merged to 'next' on 2017-05-23 at 4f60843265)
641
+ + docs/config: consistify include.path examples
642
+ + docs/config: avoid the term "expand" for includes
643
+ + docs/config: give a relative includeIf example
644
+ + docs/config: clarify include/includeIf relationship
645
646
Clarify documentation for include.path and includeIf.<condition>.path
647
configuration variables.
648
518
- Will merge to 'next'.
519
-
520
-
521
-* js/retire-old-remote-spec (2017-05-12) 11 commits
522
- . PREVIEW: remove support for .git/remotes/ and .git/branches/
523
- . PREVIEW: t0060: stop testing support for .git/remotes/ and .git/branches/
524
- . PREVIEW: t5515: remove .git/remotes/ and .git/branches/ tests
525
- . PREVIEW: remote: remove support for migrating ancient remotes
526
- . PREVIEW: t5516: stop testing .git/branches/ functionality
527
- . PREVIEW: t5510: convert .git/remotes/ test to use a regular remote
528
- . Revert "Revert "Don't create the $GIT_DIR/branches directory on init""
529
- . remote: warn loud and clear when .git/remotes/ is *still* used
530
- . remote: warn loud and clear when .git/branches/ is *still* used
531
- . Documentation: really deprecate .git/remotes/ and .git/branches/
532
- . git-parse-remote: fix highly misleading man page
533
-
534
- Stop reading from .git/remotes/ and .git/branches/, two old ways
535
- that we have been supporting to configure short-hands for fetching
536
- from remote repositories.
537
-
538
- Will discard.
539
- The procedure of removing an old and unused feature is correctly
540
- followed by this series, but it is far from clear that the feature
541
- this attempts to remove is unused or useless.
649
+ Will merge to 'master'.
650
651
652
* ab/grep-preparatory-cleanup (2017-05-21) 30 commits
@@ -575,20 +683,12 @@ of the repositories listed at
683
684
The internal implementation of "git grep" has seen some clean-up.
685
578
-
579
-* jt/push-options-doc (2017-05-10) 2 commits
580
- (merged to 'next' on 2017-05-20 at ca7f344111)
581
- + receive-pack: verify push options in cert
582
- + docs: correct receive.advertisePushOptions default
583
-
584
- The receive-pack program now makes sure that the push certificate
585
- records the same set of push options used for pushing.
586
-
587
- Will merge to 'master'.
686
+ Will merge to 'next'.
687
688
689
* dt/unpack-save-untracked-cache-extension (2017-05-20) 1 commit
591
- - unpack-trees: preserve index extensions
690
+ (merged to 'next' on 2017-05-23 at 3196d093d6)
691
+ + unpack-trees: preserve index extensions
692
693
When "git checkout", "git merge", etc. manipulates the in-core
694
index, various pieces of information in the index extensions are
@@ -598,7 +698,7 @@ of the repositories listed at
698
operations now, which would speed up "git status" (as long as the
699
cache is properly invalidated).
700
601
- Will merge to 'next'.
701
+ Will merge to 'master'.
702
703
704
* sg/clone-refspec-from-command-line-config (2017-05-16) 4 commits
@@ -612,6 +712,9 @@ of the repositories listed at
712
variables take effect while the initial clone is happening,
713
e.g. these configuration variables could be fetch refspecs.
714
715
+ Waiting for response.
716
+ cf. <xmqqa864kops.fsf@gitster.mtv.corp.google.com>
717
+
718
719
* sb/checkout-recurse-submodules (2017-05-04) 3 commits
720
(merged to 'next' on 2017-05-20 at f972b2069f)
@@ -626,41 +729,15 @@ of the repositories listed at
729
730
731
* ja/do-not-ask-needless-questions (2017-05-12) 3 commits
629
- - git-filter-branch: be more direct in an error message
630
- - read-tree -m: make error message for merging 0 trees less smart aleck
631
- - usability: don't ask questions if no reply is required
732
+ (merged to 'next' on 2017-05-23 at 6b373cd892)
733
+ + git-filter-branch: be more direct in an error message
734
+ + read-tree -m: make error message for merging 0 trees less smart aleck
735
+ + usability: don't ask questions if no reply is required
736
737
Git sometimes gives an advice in a rhetorical question that does
738
not require an answer, which can confuse new users and non native
739
speakers. Attempt to rephrase them.
740
637
- Will merge to 'next'.
638
-
639
-
640
-* ab/doc-replace-gmane-links (2017-05-09) 2 commits
641
- (merged to 'next' on 2017-05-20 at 2c4f96560c)
642
- + doc: replace more gmane links
643
- + doc: replace a couple of broken gmane links
644
-
645
- The Web interface to gmane news archive is long gone, even though
646
- the articles are still accessible via NTTP. Replace the links with
647
- ones to public-inbox.org. Because their message identification is
648
- based on the actual message-id, it is likely that it will be easier
649
- to migrate away from it if/when necessary.
650
-
651
- Will merge to 'master'.
652
-
653
-
654
-* ab/fix-poison-tests (2017-05-11) 3 commits
655
- (merged to 'next' on 2017-05-20 at 5b13ba86bd)
656
- + travis-ci: add job to run tests with GETTEXT_POISON
657
- + travis-ci: setup "prove cache" in "script" step
658
- + tests: fix tests broken under GETTEXT_POISON=YesPlease
659
-
660
- Update tests to pass under GETTEXT_POISON (a mechanism to ensure
661
- that output strings that should not be translated are not
662
- translated by mistake), and tell TravisCI to run them.
663
-
741
Will merge to 'master'.
742
743
@@ -739,26 +816,6 @@ of the repositories listed at
816
Will merge to 'master'.
817
818
742
-* rs/checkout-am-fix-unborn (2017-05-08) 2 commits
743
- (merged to 'next' on 2017-05-20 at d4f1ee3ed7)
744
- + am: check return value of resolve_refdup before using hash
745
- + checkout: check return value of resolve_refdup before using hash
746
-
747
- A few codepaths in "checkout" and "am" working on an unborn branch
748
- tried to access an uninitialized piece of memory.
749
-
750
- Will merge to 'master'.
751
-
752
-
753
-* bw/submodule-with-bs-path (2017-05-01) 1 commit
754
- (merged to 'next' on 2017-05-20 at b740f784cb)
755
- + t7400: add !CYGWIN prerequisite to 'add with \\ in path'
756
-
757
- A hotfix to a topic that is already in v2.13.
758
-
759
- Will merge to 'master'.
760
-
761
-
819
* js/plug-leaks (2017-05-09) 26 commits
820
(merged to 'next' on 2017-05-20 at fb136ea2dc)
821
+ checkout: fix memory leak
@@ -807,14 +864,6 @@ of the repositories listed at
864
Will cook in 'next'.
865
866
810
-* ls/travis-relays-for-windows-ci (2017-05-04) 2 commits
811
- (merged to 'next' on 2017-05-20 at 47f34b78e2)
812
- + travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503
813
- + travis-ci: handle Git for Windows CI status "failed" explicitly
814
-
815
- Will merge to 'master'.
816
-
817
-
867
* mb/diff-default-to-indent-heuristics (2017-05-09) 4 commits
868
- add--interactive: drop diff.indentHeuristic handling
869
- diff: enable indent heuristic by default
@@ -824,14 +873,10 @@ of the repositories listed at
873
Make the "indent" heuristics the default in "diff" and diff.indentHeuristics
874
configuration variable an escape hatch for those who do no want it.
875
827
- Kicked out of next; it seems it is still getting review suggestions?
828
-
829
-
830
-* tb/dedup-crlf-tests (2017-05-10) 1 commit
831
- (merged to 'next' on 2017-05-20 at 0a7ffff154)
832
- + t0027: tests are not expensive; remove t0025
833
-
834
- Will merge to 'master'.
876
+ Will merge to 'next'.
877
+ Looks like there may be follow-on work possible, but the topic
878
+ itself is in good order.
879
+ cf. <20170509033258.q7auj5p5lxs4tggd@sigill.intra.peff.net>
880
881
882
* jc/repack-threads (2017-04-27) 1 commit
@@ -873,6 +918,10 @@ of the repositories listed at
918
optional, and silently ignore errors from open/fopen; report such
919
errors if they are not due to missing files.
920
921
+ Will merge to 'next'.
922
+ Looks like this is now in a good shape.
923
+ cf. <20170503101706.9223-1-pclouds@gmail.com>
924
+
925
926
* bc/object-id (2017-05-08) 53 commits
927
(merged to 'next' on 2017-05-20 at e7372733fb)
@@ -929,23 +978,13 @@ of the repositories listed at
978
+ Convert struct cache_tree to use struct object_id
979
+ Clean up outstanding object_id transforms.
980
+ fetch-pack: convert to struct object_id
981
+ (this branch is used by mh/packed-ref-store-prep.)
982
983
Conversion from uchar[20] to struct object_id continues.
984
985
Will merge to 'master'.
986
987
938
-* jc/checkout-working-tree-only (2017-04-27) 1 commit
939
- - checkout: add --working-tree-only option
940
-
941
- "git checkout <tree-ish> <pathspec>" learned a variant that does
942
- not update the index when doing its thing.
943
-
944
- This was more of "the world could have been like this" illustration
945
- rather than a "let's make this change" proposal. Unless people
946
- really want it, I am inclined to discard this topic. Opinions?
947
-
948
-
988
* js/rebase-i-final (2017-05-02) 10 commits
989
- rebase -i: rearrange fixup/squash lines using the rebase--helper
990
- t3415: test fixup with wrapped oneline
@@ -965,25 +1004,26 @@ of the repositories listed at
1004
1005
1006
* bw/forking-and-threading (2017-05-15) 14 commits
968
- - usage.c: drop set_error_handle()
969
- - run-command: restrict PATH search to executable files
970
- - run-command: expose is_executable function
971
- - run-command: block signals between fork and execve
972
- - run-command: add note about forking and threading
973
- - run-command: handle dup2 and close errors in child
974
- - run-command: eliminate calls to error handling functions in child
975
- - run-command: don't die in child when duping /dev/null
976
- - run-command: prepare child environment before forking
977
- - string-list: add string_list_remove function
978
- - run-command: use the async-signal-safe execv instead of execvp
979
- - run-command: prepare command before forking
980
- - t0061: run_command executes scripts without a #! line
981
- - t5550: use write_script to generate post-update hook
1007
+ (merged to 'next' on 2017-05-23 at 79a6a59851)
1008
+ + usage.c: drop set_error_handle()
1009
+ + run-command: restrict PATH search to executable files
1010
+ + run-command: expose is_executable function
1011
+ + run-command: block signals between fork and execve
1012
+ + run-command: add note about forking and threading
1013
+ + run-command: handle dup2 and close errors in child
1014
+ + run-command: eliminate calls to error handling functions in child
1015
+ + run-command: don't die in child when duping /dev/null
1016
+ + run-command: prepare child environment before forking
1017
+ + string-list: add string_list_remove function
1018
+ + run-command: use the async-signal-safe execv instead of execvp
1019
+ + run-command: prepare command before forking
1020
+ + t0061: run_command executes scripts without a #! line
1021
+ + t5550: use write_script to generate post-update hook
1022
1023
The "run-command" API implementation has been made more robust
1024
against dead-locking in a threaded environment.
1025
986
- Will merge to 'next'.
1026
+ Will merge to 'master'.
1027
1028
1029
* sb/reset-recurse-submodules (2017-04-23) 4 commits
@@ -992,6 +1032,7 @@ of the repositories listed at
1032
+ submodule.c: submodule_move_head works with broken submodules
1033
+ submodule.c: uninitialized submodules are ignored in recursive commands
1034
+ entry.c: submodule recursing: respect force flag correctly
1035
+ (this branch is used by sb/submodule-blanket-recursive.)
1036
1037
"git reset" learned "--recurse-submodules" option.
1038
@@ -999,22 +1040,23 @@ of the repositories listed at
1040
1041
1042
* bp/sub-process-convert-filter (2017-05-15) 11 commits
1002
- - convert: update subprocess_read_status() to not die on EOF
1003
- - sub-process: move sub-process functions into separate files
1004
- - convert: rename reusable sub-process functions
1005
- - convert: update generic functions to only use generic data structures
1006
- - convert: separate generic structures and variables from the filter specific ones
1007
- - convert: split start_multi_file_filter() into two separate functions
1008
- - pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL
1009
- - convert: move packet_write_line() into pkt-line as packet_writel()
1010
- - pkt-line: add packet_read_line_gently()
1011
- - pkt-line: fix packet_read_line() to handle len < 0 errors
1012
- - convert: remove erroneous tests for errno == EPIPE
1043
+ (merged to 'next' on 2017-05-23 at 89f5420a82)
1044
+ + convert: update subprocess_read_status() to not die on EOF
1045
+ + sub-process: move sub-process functions into separate files
1046
+ + convert: rename reusable sub-process functions
1047
+ + convert: update generic functions to only use generic data structures
1048
+ + convert: separate generic structures and variables from the filter specific ones
1049
+ + convert: split start_multi_file_filter() into two separate functions
1050
+ + pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL
1051
+ + convert: move packet_write_line() into pkt-line as packet_writel()
1052
+ + pkt-line: add packet_read_line_gently()
1053
+ + pkt-line: fix packet_read_line() to handle len < 0 errors
1054
+ + convert: remove erroneous tests for errno == EPIPE
1055
1056
Code from "conversion using external process" codepath has been
1057
extracted to a separate sub-process.[ch] module.
1058
1017
- Will merge to 'next'.
1059
+ Will merge to 'master'.
1060
1061
1062
* nd/prune-in-worktree (2017-04-24) 12 commits
@@ -1041,7 +1083,6 @@ of the repositories listed at
1083
Has been waiting for nd/worktree-kill-parse-ref to settle.
1084
cf. <CACsJy8ADCVBiLoPg_Tz0L6CMdh_eFmK4RYzfQ-PmUgBK7w9e=A@mail.gmail.com>
1085
1044
-
1086
--------------------------------------------------
1087
[Discard]
1088
@@ -1057,3 +1098,42 @@ of the repositories listed at
1098
cf. <CACBZZX4UUwzRQmyH8joYaqHnuVTjVtGBHp+iZKcnAnwoM_ZJhg@mail.gmail.com>
1099
1100
1101
+* jk/no-looking-at-dotgit-outside-repo (2017-05-15) 1 commit
1102
+ . config: complain about --local outside of a git repo
1103
+
1104
+ Will discard.
1105
+ Superseded by jk/bug-to-abort.
1106
+
1107
+
1108
+* js/retire-old-remote-spec (2017-05-12) 11 commits
1109
+ . PREVIEW: remove support for .git/remotes/ and .git/branches/
1110
+ . PREVIEW: t0060: stop testing support for .git/remotes/ and .git/branches/
1111
+ . PREVIEW: t5515: remove .git/remotes/ and .git/branches/ tests
1112
+ . PREVIEW: remote: remove support for migrating ancient remotes
1113
+ . PREVIEW: t5516: stop testing .git/branches/ functionality
1114
+ . PREVIEW: t5510: convert .git/remotes/ test to use a regular remote
1115
+ . Revert "Revert "Don't create the $GIT_DIR/branches directory on init""
1116
+ . remote: warn loud and clear when .git/remotes/ is *still* used
1117
+ . remote: warn loud and clear when .git/branches/ is *still* used
1118
+ . Documentation: really deprecate .git/remotes/ and .git/branches/
1119
+ . git-parse-remote: fix highly misleading man page
1120
+
1121
+ Stop reading from .git/remotes/ and .git/branches/, two old ways
1122
+ that we have been supporting to configure short-hands for fetching
1123
+ from remote repositories.
1124
+
1125
+ Will discard.
1126
+ The procedure of removing an old and unused feature is correctly
1127
+ followed by this series, but it is far from clear that the feature
1128
+ this attempts to remove is unused or useless.
1129
+
1130
+
1131
+* jc/checkout-working-tree-only (2017-04-27) 1 commit
1132
+ . checkout: add --working-tree-only option
1133
+
1134
+ "git checkout <tree-ish> <pathspec>" learned a variant that does
1135
+ not update the index when doing its thing.
1136
+
1137
+ Will discard.
1138
+ This was more of "the world could have been like this" illustration
1139
+ rather than a "let's make this change" proposal.