What's cooking (2020/03 #01)
Junio C Hamano committed
Mar 3, 2020 at 13:39 UTC
a615ef467bdbe6169a26c70a34707747c0a441ef
1 file changed
+303
-264
whats-cooking.txt
+303
-264
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2020, #06; Fri, 28)
4
-X-master-at: 2d2118b814c11f509e1aa76cb07110f7231668dc
5
-X-next-at: f298c6ed49a42836ab0b0f9c379d447974961a64
3
+Subject: What's cooking in git.git (Mar 2020, #01; Tue, 3)
4
+X-master-at: 2f268890c2cd2f115424936bbee27f8269080e5e
5
+X-next-at: 5e7596f4ac6ed24f8c8b715a297eeb8623e7c204
6
7
-What's cooking in git.git (Feb 2020, #06; Fri, 28)
7
+What's cooking in git.git (Mar 2020, #01; Tue, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,106 +12,214 @@ 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
+2.26-rc0 is planned to happen tomorrow (see tinyurl.com/gitCal).
16
+The set of remaining topics in 'next' has been shrinking and today
17
+may be a good cut-off point to declare that anything that is not in
18
+'next' isn't expected to ship with the 2.26 release, unless it is an
19
+obvious regression fix. That does not mean everything in 'next'
20
+today will be in the release, either.
21
+
22
You can find the changes described here in the integration branches
23
of the repositories listed at
24
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
27
--------------------------------------------------
21
-[New Topics]
28
+[Graduated to "master"]
29
23
-* ag/rebase-remove-redundant-code (2020-02-26) 1 commit
24
- (merged to 'next' on 2020-02-27 at b1f5289b67)
25
- + builtin/rebase: remove a call to get_oid() on `options.switch_to'
30
+* ak/test-log-graph (2020-02-24) 2 commits
31
+ (merged to 'next' on 2020-02-25 at 2b68666ffa)
32
+ + lib-log-graph: consolidate colored graph cmp logic
33
+ + lib-log-graph: consolidate test_cmp_graph logic
34
27
- Code reduction.
35
+ Test update.
36
29
- Will merge to 'master'.
37
38
+* ds/partial-clone-fixes (2020-02-22) 2 commits
39
+ (merged to 'next' on 2020-02-25 at a26434bb7a)
40
+ + partial-clone: avoid fetching when looking for objects
41
+ + partial-clone: demonstrate bugs in partial fetch
42
32
-* js/ci-windows-update (2020-02-27) 3 commits
33
- (merged to 'next' on 2020-02-27 at 691f1c929c)
34
- + Azure Pipeline: switch to the latest agent pools
35
- + ci: prevent `perforce` from being quarantined
36
- + t/lib-httpd: avoid using macOS' sed
43
+ Fix for a bug revealed by a recent change to make the protocol v2
44
+ the default.
45
38
- Updates to the CI settings.
46
40
- Will merge to 'master'.
47
+* en/check-ignore (2020-02-18) 1 commit
48
+ (merged to 'next' on 2020-02-22 at f05a752211)
49
+ + check-ignore: fix documentation and implementation to match
50
51
+ "git check-ignore" did not work when the given path is explicitly
52
+ marked as not ignored with a negative entry in the .gitignore file.
53
43
-* en/merge-path-collision (2020-02-27) 1 commit
44
- - merge-recursive: apply collision handling unification to recursive case
54
46
- Handling of conflicting renames in merge-recursive have further
47
- been made consistent with how existing codepaths try to mimick what
48
- is done to add/add conflicts.
55
+* en/rebase-backend (2020-02-16) 20 commits
56
+ (merged to 'next' on 2020-02-22 at cae5eb0f18)
57
+ + rebase: rename the two primary rebase backends
58
+ + rebase: change the default backend from "am" to "merge"
59
+ + rebase: make the backend configurable via config setting
60
+ + rebase tests: repeat some tests using the merge backend instead of am
61
+ + rebase tests: mark tests specific to the am-backend with --am
62
+ + rebase: drop '-i' from the reflog for interactive-based rebases
63
+ + git-prompt: change the prompt for interactive-based rebases
64
+ + rebase: add an --am option
65
+ + rebase: move incompatibility checks between backend options a bit earlier
66
+ + git-rebase.txt: add more details about behavioral differences of backends
67
+ + rebase: allow more types of rebases to fast-forward
68
+ + t3432: make these tests work with either am or merge backends
69
+ + rebase: fix handling of restrict_revision
70
+ + rebase: make sure to pass along the quiet flag to the sequencer
71
+ + rebase, sequencer: remove the broken GIT_QUIET handling
72
+ + t3406: simplify an already simple test
73
+ + rebase (interactive-backend): fix handling of commits that become empty
74
+ + rebase (interactive-backend): make --keep-empty the default
75
+ + t3404: directly test the behavior of interest
76
+ + git-rebase.txt: update description of --allow-empty-message
77
50
- Will merge to 'next'.
78
+ "git rebase" has learned to use the merge backend (i.e. the
79
+ machinery that drives "rebase -i") by default, while allowing
80
+ "--apply" option to use the "apply" backend (e.g. the moral
81
+ equivalent of "format-patch piped to am"). The rebase.backend
82
+ configuration variable can be set to customize.
83
84
53
-* en/test-cleanup (2020-02-27) 5 commits
54
- - t6020: new test with interleaved lexicographic ordering of directories
55
- - t6022, t6046: test expected behavior instead of testing a proxy for it
56
- - t3035: prefer test_must_fail to bash negation for git commands
57
- - t6020, t6022, t6035: update merge tests to use test helper functions
58
- - t602[1236], t6034: modernize test formatting
85
+* en/t3433-rebase-stat-dirty-failure (2020-02-19) 2 commits
86
+ (merged to 'next' on 2020-02-25 at 000d596d4c)
87
+ + merge-recursive: fix the refresh logic in update_file_flags
88
+ + t3433: new rebase testcase documenting a stat-dirty-like failure
89
60
- Test cleanup.
90
+ The merge-recursive machinery failed to refresh the cache entry for
91
+ a merge result in a couple of places, resulting in an unnecessary
92
+ merge failure, which has been fixed.
93
62
- Will merge to 'next'.
94
95
+* es/worktree-cleanup (2020-02-24) 1 commit
96
+ (merged to 'next' on 2020-02-25 at 59bc458bcd)
97
+ + worktree: drop unused code from get_main_worktree()
98
65
-* js/https-proxy-config (2020-02-27) 2 commits
66
- - config: documentation for HTTPS proxy client cert.
67
- - http: add client cert for HTTPS proxies.
99
+ Code cleanup.
100
69
- A handful of options to configure SSL when talking to proxies have
70
- been added.
101
72
- Not enough review. Addition of on-disk key looks wrong.
102
+* jk/doc-diff-parallel (2020-02-18) 1 commit
103
+ (merged to 'next' on 2020-02-19 at 62b2264fca)
104
+ + doc-diff: use single-colon rule in rendering Makefile
105
106
+ Update to doc-diff.
107
75
-* rs/commit-graph-code-simplification (2020-02-27) 1 commit
76
- (merged to 'next' on 2020-02-27 at f298c6ed49)
77
- + commit-graph: use progress title directly
108
79
- Code simplfication.
109
+* jk/object-filter-with-bitmap (2020-02-18) 16 commits
110
+ (merged to 'next' on 2020-02-19 at d38487e23d)
111
+ + rev-list --count: comment on the use of count_right++
112
+ (merged to 'next' on 2020-02-16 at 42425c3658)
113
+ + pack-objects: support filters with bitmaps
114
+ + pack-bitmap: implement BLOB_LIMIT filtering
115
+ + pack-bitmap: implement BLOB_NONE filtering
116
+ + bitmap: add bitmap_unset() function
117
+ + rev-list: use bitmap filters for traversal
118
+ + pack-bitmap: basic noop bitmap filter infrastructure
119
+ + rev-list: allow commit-only bitmap traversals
120
+ + t5310: factor out bitmap traversal comparison
121
+ + rev-list: allow bitmaps when counting objects
122
+ + rev-list: make --count work with --objects
123
+ + rev-list: factor out bitmap-optimized routines
124
+ + pack-bitmap: refuse to do a bitmap traversal with pathspecs
125
+ + rev-list: fallback to non-bitmap traversal when filtering
126
+ + pack-bitmap: fix leak of haves/wants object lists
127
+ + pack-bitmap: factor out type iterator initialization
128
81
- Will merge to 'master'.
129
+ The object reachability bitmap machinery and the partial cloning
130
+ machinery were not prepared to work well together, because some
131
+ object-filtering criteria that partial clones use inherently rely
132
+ on object traversal, but the bitmap machinery is an optimization
133
+ to bypass that object traversal. There however are some cases
134
+ where they can work together, and they were taught about them.
135
136
84
-* jc/doc-single-h-is-for-help (2020-02-27) 1 commit
85
- - Documentation: clarify that `-h` alone stands for `help`
137
+* jk/push-option-doc-markup-fix (2020-02-18) 1 commit
138
+ (merged to 'next' on 2020-02-19 at 975e00fa99)
139
+ + doc/config/push: use longer "--" line for preformatted example
140
87
- Both "git ls-remote -h" and "git grep -h" give short usage help,
88
- like any other Git subcommand, but it is not unreasonable to expect
89
- that the former would behave the same as "git ls-remote --head"
90
- (there is no other sensible behaviour for the latter). The
91
- documentation has been updated in an attempt to clarify this.
141
+ Doc markup fix.
142
143
94
-* hi/gpg-use-check-signature (2020-02-28) 1 commit
95
- - Revert "gpg-interface: prefer check_signature() for GPG verification"
144
+* jk/run-command-formatfix (2020-02-22) 1 commit
145
+ (merged to 'next' on 2020-02-25 at 39ad6eeb86)
146
+ + run-command.h: fix mis-indented struct member
147
+
148
+ Code style cleanup.
149
+
150
+
151
+* ma/test-cleanup (2020-02-24) 3 commits
152
+ (merged to 'next' on 2020-02-25 at ce00c705a9)
153
+ + t: drop debug `cat` calls
154
+ + t9810: drop debug `cat` call
155
+ + t4117: check for files using `test_path_is_file`
156
+
157
+ Code cleanup.
158
+
159
+
160
+* rs/blame-typefix-for-fingerprint (2020-02-24) 1 commit
161
+ (merged to 'next' on 2020-02-25 at 496309f50a)
162
+ + blame: provide type of fingerprints pointer
163
+
164
+ Code cleanup.
165
+
166
+
167
+* rs/micro-cleanups (2020-02-24) 2 commits
168
+ (merged to 'next' on 2020-02-25 at eaa8fd097b)
169
+ + use strpbrk(3) to search for characters from a given set
170
+ + quote: use isalnum() to check for alphanumeric characters
171
+
172
+ Code cleanup.
173
+
174
+--------------------------------------------------
175
+[New Topics]
176
+
177
+* ah/force-pull-rebase-configuration (2020-03-02) 1 commit
178
+ . pull: warn if the user didn't say whether to rebase or to merge
179
+
180
+ "git pull" learned to warn when no pull.rebase configuration
181
+ exists, and neither --[no-]rebase nor --ff-only is given (which
182
+ would result a merge).
183
+
184
+ Needs to adjust some tests.
185
97
- "git merge signed-tag" while lacking the public key started to say
98
- "No signature", which was utterly wrong. This regression has been
99
- reverted.
186
+
187
+* hd/show-one-mergetag-fix (2020-03-02) 1 commit
188
+ (merged to 'next' on 2020-03-02 at 12fe907f8d)
189
+ + show_one_mergetag: print non-parent in hex form.
190
+
191
+ "git show" and others gave an object name in raw format in its
192
+ error output, which has been corrected to give it in hex.
193
+
194
+ Will merge to 'master'.
195
+
196
+
197
+* tg/retire-scripted-stash (2020-03-03) 2 commits
198
+ - stash: remove the stash.useBuiltin setting
199
+ - stash: get git_stash_config at the top level
200
+
201
+ "git stash" has kept an escape hatch to use the scripted version
202
+ for a few releases, which got stale. It has been removed.
203
204
Will merge to 'next'.
205
206
104
-* rt/format-zero-length-fix (2020-02-28) 2 commits
105
- - config.mak.dev: re-enable -Wformat-zero-length
106
- - rebase-interactive.c: silence format-zero-length warnings
207
+* es/outside-repo-errmsg-hints (2020-03-03) 1 commit
208
+ - prefix_path: show gitdir if worktree unavailable
209
108
- Recently we inadvertently added a few instances of using 0-width
109
- format string to functions that we mark as printf-like without any
110
- developers noticing. The root cause was that the compiler warning
111
- that is triggered by this is almost always useless and we disabled
112
- the warning in our developer builds, but not for general public.
113
- The new instances have been corrected, and the warning has been
114
- resurrected in the developer builds.
210
+ An earlier update to show the location of working tree in the error
211
+ message did not consider the possibility that a git command may be
212
+ run in a bare repository, which has been corrected.
213
+
214
+ May want a test or two.
215
+
216
+
217
+* rs/show-progress-in-dumb-http-fetch (2020-03-03) 1 commit
218
+ - remote-curl: show progress for fetches over dumb HTTP
219
+
220
+ "git fetch" over HTTP walker protocol did not show any progress
221
+ output. We inherently do not know how much work remains, but still
222
+ we can show something not to bore users.
223
224
Will merge to 'next'.
225
@@ -232,118 +340,160 @@ of the repositories listed at
340
--------------------------------------------------
341
[Cooking]
342
235
-* pw/advise-rebase-skip (2019-12-06) 9 commits
236
- - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
237
- - rebase: fix advice when a fixup creates an empty commit
238
- - commit: give correct advice for empty commit during a rebase
239
- - commit: encapsulate determine_whence() for sequencer
240
- - commit: use enum value for multiple cherry-picks
241
- - sequencer: write CHERRY_PICK_HEAD for reword and edit
242
- - cherry-pick: check commit error messages
243
- - cherry-pick: add test for `--skip` advice in `git commit`
244
- - t3404: use test_cmp_rev
343
+* ag/rebase-remove-redundant-code (2020-02-26) 1 commit
344
+ (merged to 'next' on 2020-02-27 at b1f5289b67)
345
+ + builtin/rebase: remove a call to get_oid() on `options.switch_to'
346
246
- The mechanism to prevent "git commit" from making an empty commit
247
- or amending during an interrupted cherry-pick was broken during the
248
- rewrite of "git rebase" in C, which has been corrected.
347
+ Code reduction.
348
250
- Will discard the tip two, which are still RFC, and advance the rest.
251
- cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
349
+ Will merge to 'master'.
350
351
254
-* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
255
- - rebase: --fork-point regression fix
352
+* js/ci-windows-update (2020-02-27) 3 commits
353
+ (merged to 'next' on 2020-02-27 at 691f1c929c)
354
+ + Azure Pipeline: switch to the latest agent pools
355
+ + ci: prevent `perforce` from being quarantined
356
+ + t/lib-httpd: avoid using macOS' sed
357
257
- The "--fork-point" mode of "git rebase" regressed when the command
258
- was rewritten in C back in 2.20 era, which has been corrected.
358
+ Updates to the CI settings.
359
260
- Will merge to 'next'.
261
- Was waiting for a response to "shouldn't this be sufficient?" but
262
- I think it should.
360
+ Will merge to 'master'.
361
362
265
-* am/mingw-poll-fix (2020-02-27) 1 commit
266
- - mingw: workaround for hangs when sending STDIN
363
+* en/merge-path-collision (2020-02-27) 1 commit
364
+ (merged to 'next' on 2020-03-02 at cb2655c779)
365
+ + merge-recursive: apply collision handling unification to recursive case
366
268
- MinGW's poll() emulation has been improved.
367
+ Handling of conflicting renames in merge-recursive have further
368
+ been made consistent with how existing codepaths try to mimic what
369
+ is done to add/add conflicts.
370
270
- Will merge to 'next'.
371
+ Will merge to 'master'.
372
373
273
-* en/check-ignore (2020-02-18) 1 commit
274
- (merged to 'next' on 2020-02-22 at f05a752211)
275
- + check-ignore: fix documentation and implementation to match
374
+* en/test-cleanup (2020-02-27) 5 commits
375
+ (merged to 'next' on 2020-03-02 at 93a81886b7)
376
+ + t6020: new test with interleaved lexicographic ordering of directories
377
+ + t6022, t6046: test expected behavior instead of testing a proxy for it
378
+ + t3035: prefer test_must_fail to bash negation for git commands
379
+ + t6020, t6022, t6035: update merge tests to use test helper functions
380
+ + t602[1236], t6034: modernize test formatting
381
277
- "git check-ignore" did not work when the given path is explicitly
278
- marked as not ignored with a negative entry in the .gitignore file.
382
+ Test cleanup.
383
384
Will merge to 'master'.
385
386
283
-* en/t3433-rebase-stat-dirty-failure (2020-02-19) 2 commits
284
- (merged to 'next' on 2020-02-25 at 000d596d4c)
285
- + merge-recursive: fix the refresh logic in update_file_flags
286
- + t3433: new rebase testcase documenting a stat-dirty-like failure
387
+* js/https-proxy-config (2020-02-27) 2 commits
388
+ - config: documentation for HTTPS proxy client cert.
389
+ - http: add client cert for HTTPS proxies.
390
288
- The merge-recursive machinery failed to refresh the cache entry for
289
- a merge result in a couple of places, resulting in an unnecessary
290
- merge failure, which has been fixed.
391
+ A handful of options to configure SSL when talking to proxies have
392
+ been added.
393
+
394
+ Not enough review. Addition of on-disk key looks wrong.
395
+
396
+
397
+* rs/commit-graph-code-simplification (2020-02-27) 1 commit
398
+ (merged to 'next' on 2020-02-27 at f298c6ed49)
399
+ + commit-graph: use progress title directly
400
+
401
+ Code simplfication.
402
403
Will merge to 'master'.
404
405
295
-* jk/doc-diff-parallel (2020-02-18) 1 commit
296
- (merged to 'next' on 2020-02-19 at 62b2264fca)
297
- + doc-diff: use single-colon rule in rendering Makefile
406
+* jc/doc-single-h-is-for-help (2020-02-27) 1 commit
407
+ - Documentation: clarify that `-h` alone stands for `help`
408
+
409
+ Both "git ls-remote -h" and "git grep -h" give short usage help,
410
+ like any other Git subcommand, but it is not unreasonable to expect
411
+ that the former would behave the same as "git ls-remote --head"
412
+ (there is no other sensible behaviour for the latter). The
413
+ documentation has been updated in an attempt to clarify this.
414
299
- Update to doc-diff.
415
+
416
+* hi/gpg-use-check-signature (2020-02-28) 1 commit
417
+ (merged to 'next' on 2020-03-02 at 273fb30874)
418
+ + Revert "gpg-interface: prefer check_signature() for GPG verification"
419
+
420
+ "git merge signed-tag" while lacking the public key started to say
421
+ "No signature", which was utterly wrong. This regression has been
422
+ reverted.
423
424
Will merge to 'master'.
425
426
304
-* jk/push-option-doc-markup-fix (2020-02-18) 1 commit
305
- (merged to 'next' on 2020-02-19 at 975e00fa99)
306
- + doc/config/push: use longer "--" line for preformatted example
427
+* rt/format-zero-length-fix (2020-02-28) 2 commits
428
+ (merged to 'next' on 2020-03-02 at a4070ef573)
429
+ + config.mak.dev: re-enable -Wformat-zero-length
430
+ + rebase-interactive.c: silence format-zero-length warnings
431
308
- Doc markup fix.
432
+ Recently we inadvertently added a few instances of using 0-width
433
+ format string to functions that we mark as printf-like without any
434
+ developers noticing. The root cause was that the compiler warning
435
+ that is triggered by this is almost always useless and we disabled
436
+ the warning in our developer builds, but not for general public.
437
+ The new instances have been corrected, and the warning has been
438
+ resurrected in the developer builds.
439
440
Will merge to 'master'.
441
442
313
-* ak/test-log-graph (2020-02-24) 2 commits
314
- (merged to 'next' on 2020-02-25 at 2b68666ffa)
315
- + lib-log-graph: consolidate colored graph cmp logic
316
- + lib-log-graph: consolidate test_cmp_graph logic
443
+* pw/advise-rebase-skip (2019-12-06) 9 commits
444
+ - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
445
+ - rebase: fix advice when a fixup creates an empty commit
446
+ - commit: give correct advice for empty commit during a rebase
447
+ - commit: encapsulate determine_whence() for sequencer
448
+ - commit: use enum value for multiple cherry-picks
449
+ - sequencer: write CHERRY_PICK_HEAD for reword and edit
450
+ - cherry-pick: check commit error messages
451
+ - cherry-pick: add test for `--skip` advice in `git commit`
452
+ - t3404: use test_cmp_rev
453
318
- Test update.
454
+ The mechanism to prevent "git commit" from making an empty commit
455
+ or amending during an interrupted cherry-pick was broken during the
456
+ rewrite of "git rebase" in C, which has been corrected.
457
+
458
+ Will discard the tip two, which are still RFC, and advance the rest.
459
+ cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
460
+
461
+
462
+* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
463
+ (merged to 'next' on 2020-03-02 at a1a84d37a7)
464
+ + rebase: --fork-point regression fix
465
+
466
+ The "--fork-point" mode of "git rebase" regressed when the command
467
+ was rewritten in C back in 2.20 era, which has been corrected.
468
469
Will merge to 'master'.
470
+ Was waiting for a response to "shouldn't this be sufficient?" but
471
+ I think it should.
472
473
323
-* ds/partial-clone-fixes (2020-02-22) 2 commits
324
- (merged to 'next' on 2020-02-25 at a26434bb7a)
325
- + partial-clone: avoid fetching when looking for objects
326
- + partial-clone: demonstrate bugs in partial fetch
474
+* am/mingw-poll-fix (2020-02-27) 1 commit
475
+ (merged to 'next' on 2020-03-02 at 7082619f34)
476
+ + mingw: workaround for hangs when sending STDIN
477
328
- Fix for a bug revealed by a recent change to make the protocol v2
329
- the default.
478
+ MinGW's poll() emulation has been improved.
479
480
Will merge to 'master'.
481
482
483
* pb/am-show-current-patch (2020-02-20) 5 commits
335
- - am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
336
- - am: support --show-current-patch=raw as a synonym for--show-current-patch
337
- - am: convert "resume" variable to a struct
338
- - parse-options: convert "command mode" to a flag
339
- - parse-options: add testcases for OPT_CMDMODE()
484
+ (merged to 'next' on 2020-03-02 at 30b5300705)
485
+ + am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
486
+ + am: support --show-current-patch=raw as a synonym for--show-current-patch
487
+ + am: convert "resume" variable to a struct
488
+ + parse-options: convert "command mode" to a flag
489
+ + parse-options: add testcases for OPT_CMDMODE()
490
491
"git am --short-current-patch" is a way to show the piece of e-mail
492
for the stopped step, which is not suitable to directly feed "git
493
apply" (it is designed to be a good "git am" input). It learned a
494
new option to show only the patch part.
495
346
- Will merge to 'next'.
496
+ Will merge to 'master'.
497
498
499
* bc/wildcard-credential (2020-02-20) 5 commits
@@ -373,7 +523,8 @@ of the repositories listed at
523
524
525
* jc/describe-misnamed-annotated-tag (2020-02-20) 1 commit
376
- - describe: force long format for a name based on a mislocated tag
526
+ (merged to 'next' on 2020-03-02 at b4e2ca6a46)
527
+ + describe: force long format for a name based on a mislocated tag
528
529
When "git describe C" finds an annotated tag with tagname A to be
530
the best name to explain commit C, and the tag is stored in a
@@ -384,15 +535,6 @@ of the repositories listed at
535
behavior of the command has been changed to use the "long" form
536
i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse.
537
387
- Will merge to 'next'.
388
-
389
-
390
-* jk/run-command-formatfix (2020-02-22) 1 commit
391
- (merged to 'next' on 2020-02-25 at 39ad6eeb86)
392
- + run-command.h: fix mis-indented struct member
393
-
394
- Code style cleanup.
395
-
538
Will merge to 'master'.
539
540
@@ -406,11 +548,12 @@ of the repositories listed at
548
549
550
* rj/t1050-use-test-path-is-file (2020-02-24) 1 commit
409
- - t1050: replace test -f with test_path_is_file
551
+ (merged to 'next' on 2020-03-02 at 68a681640e)
552
+ + t1050: replace test -f with test_path_is_file
553
554
Code cleanup.
555
413
- Will merge to 'next'.
556
+ Will merge to 'master'.
557
558
559
* bc/sha-256-part-1-of-4 (2020-02-28) 22 commits
@@ -440,7 +583,7 @@ of the repositories listed at
583
SHA-256 transition continues.
584
585
Tentatively I dropped the bits about signed tag, as it depended on
443
- a reverted change to the gpg interface API.
586
+ a reverted change to the gpg interface API.
587
588
589
* es/do-not-let-rebase-switch-to-protected-branch (2020-02-24) 2 commits
@@ -461,18 +604,9 @@ of the repositories listed at
604
+ worktree: add utility to find worktree by pathname
605
+ worktree: improve find_worktree() documentation
606
464
- "git worktree add" used to get confused that the director to be
465
- used to add a new worktreey, when given as a relative path, is
466
- different from an existing one. This has been corrected.
467
-
468
- Will merge to 'master'.
469
-
470
-
471
-* es/worktree-cleanup (2020-02-24) 1 commit
472
- (merged to 'next' on 2020-02-25 at 59bc458bcd)
473
- + worktree: drop unused code from get_main_worktree()
474
-
475
- Code cleanup.
607
+ In rare cases "git worktree add <path>" could think that <path>
608
+ was already a registered worktree even when it wasn't and refuse
609
+ to add the new worktree. This has been corrected.
610
611
Will merge to 'master'.
612
@@ -511,40 +645,11 @@ of the repositories listed at
645
646
647
* kk/complete-diff-color-moved (2020-02-24) 1 commit
514
- - completion: add diff --color-moved[-ws]
648
+ (merged to 'next' on 2020-03-02 at 1bdb401f6a)
649
+ + completion: add diff --color-moved[-ws]
650
651
Completion update.
652
518
- Will merge to 'next'.
519
-
520
-
521
-* ma/test-cleanup (2020-02-24) 3 commits
522
- (merged to 'next' on 2020-02-25 at ce00c705a9)
523
- + t: drop debug `cat` calls
524
- + t9810: drop debug `cat` call
525
- + t4117: check for files using `test_path_is_file`
526
-
527
- Code cleanup.
528
-
529
- Will merge to 'master'.
530
-
531
-
532
-* rs/blame-typefix-for-fingerprint (2020-02-24) 1 commit
533
- (merged to 'next' on 2020-02-25 at 496309f50a)
534
- + blame: provide type of fingerprints pointer
535
-
536
- Code cleanup.
537
-
538
- Will merge to 'master'.
539
-
540
-
541
-* rs/micro-cleanups (2020-02-24) 2 commits
542
- (merged to 'next' on 2020-02-25 at eaa8fd097b)
543
- + use strpbrk(3) to search for characters from a given set
544
- + quote: use isalnum() to check for alphanumeric characters
545
-
546
- Code cleanup.
547
-
653
Will merge to 'master'.
654
655
@@ -559,38 +664,9 @@ of the repositories listed at
664
Will merge to 'master'.
665
666
562
-* jk/object-filter-with-bitmap (2020-02-18) 16 commits
563
- (merged to 'next' on 2020-02-19 at d38487e23d)
564
- + rev-list --count: comment on the use of count_right++
565
- (merged to 'next' on 2020-02-16 at 42425c3658)
566
- + pack-objects: support filters with bitmaps
567
- + pack-bitmap: implement BLOB_LIMIT filtering
568
- + pack-bitmap: implement BLOB_NONE filtering
569
- + bitmap: add bitmap_unset() function
570
- + rev-list: use bitmap filters for traversal
571
- + pack-bitmap: basic noop bitmap filter infrastructure
572
- + rev-list: allow commit-only bitmap traversals
573
- + t5310: factor out bitmap traversal comparison
574
- + rev-list: allow bitmaps when counting objects
575
- + rev-list: make --count work with --objects
576
- + rev-list: factor out bitmap-optimized routines
577
- + pack-bitmap: refuse to do a bitmap traversal with pathspecs
578
- + rev-list: fallback to non-bitmap traversal when filtering
579
- + pack-bitmap: fix leak of haves/wants object lists
580
- + pack-bitmap: factor out type iterator initialization
581
-
582
- The object reachability bitmap machinery and the partial cloning
583
- machinery were not prepared to work well together, because some
584
- object-filtering criteria that partial clones use inherently rely
585
- on object traversal, but the bitmap machinery is an optimization
586
- to bypass that object traversal. There however are some cases
587
- where they can work together, and they were taught about them.
588
-
589
- Will merge to 'master'.
590
-
591
-
592
-* hw/advise-ng (2020-02-27) 4 commits
667
+* hw/advise-ng (2020-03-02) 5 commits
668
- tag: use new advice API to check visibility
669
+ - SQUASH???
670
- advice: revamp advise API
671
- advice: change "setupStreamFailure" to "setUpstreamFailure"
672
- advice: extract vadvise() from advise()
@@ -630,25 +706,18 @@ of the repositories listed at
706
SHA-256 topic.
707
708
633
-* es/bugreport (2020-02-20) 15 commits
634
- - bugreport: summarize contents of alternates file
635
- - bugreport: list contents of $OBJDIR/info
636
- - bugreport: add packed object summary
637
- - bugreport: count loose objects
638
- - bugreport: collect list of populated hooks
639
- - bugreport: add config values from safelist
640
- - bugreport: generate config safelist based on docs
641
- - bugreport: include user interactive shell
642
- - bugreport: add git-remote-https version
709
+* es/bugreport (2020-03-02) 5 commits
710
- bugreport: add compiler info
711
- bugreport: add uname info
712
- bugreport: gather git version and build info
713
- bugreport: add tool to generate debugging info
647
- - help: add shell-path to --build-options
714
- help: move list_config_help to builtin/help
715
716
The "bugreport" tool.
717
718
+ This round has narrowed its scope significantly, and IMHO should be
719
+ easier to review.
720
+
721
722
* gs/commit-graph-path-filter (2020-02-12) 12 commits
723
- (bytesex breakage band-aid)
@@ -694,50 +763,20 @@ of the repositories listed at
763
764
765
* am/pathspec-f-f-more (2020-02-19) 8 commits
697
- - stash push: support the --pathspec-from-file option
698
- - stash: eliminate crude option parsing
699
- - doc: stash: synchronize <pathspec> description
700
- - doc: stash: document more options
701
- - doc: stash: split options from description (2)
702
- - doc: stash: split options from description (1)
703
- - rm: support the --pathspec-from-file option
704
- - doc: rm: synchronize <pathspec> description
766
+ (merged to 'next' on 2020-03-02 at 33ff7e29f0)
767
+ + stash push: support the --pathspec-from-file option
768
+ + stash: eliminate crude option parsing
769
+ + doc: stash: synchronize <pathspec> description
770
+ + doc: stash: document more options
771
+ + doc: stash: split options from description (2)
772
+ + doc: stash: split options from description (1)
773
+ + rm: support the --pathspec-from-file option
774
+ + doc: rm: synchronize <pathspec> description
775
776
"git rm" and "git stash" learns the new "--pathspec-from-file"
777
option.
778
709
- Will merge to 'next'.
710
-
711
-
712
-* en/rebase-backend (2020-02-16) 20 commits
713
- (merged to 'next' on 2020-02-22 at cae5eb0f18)
714
- + rebase: rename the two primary rebase backends
715
- + rebase: change the default backend from "am" to "merge"
716
- + rebase: make the backend configurable via config setting
717
- + rebase tests: repeat some tests using the merge backend instead of am
718
- + rebase tests: mark tests specific to the am-backend with --am
719
- + rebase: drop '-i' from the reflog for interactive-based rebases
720
- + git-prompt: change the prompt for interactive-based rebases
721
- + rebase: add an --am option
722
- + rebase: move incompatibility checks between backend options a bit earlier
723
- + git-rebase.txt: add more details about behavioral differences of backends
724
- + rebase: allow more types of rebases to fast-forward
725
- + t3432: make these tests work with either am or merge backends
726
- + rebase: fix handling of restrict_revision
727
- + rebase: make sure to pass along the quiet flag to the sequencer
728
- + rebase, sequencer: remove the broken GIT_QUIET handling
729
- + t3406: simplify an already simple test
730
- + rebase (interactive-backend): fix handling of commits that become empty
731
- + rebase (interactive-backend): make --keep-empty the default
732
- + t3404: directly test the behavior of interest
733
- + git-rebase.txt: update description of --allow-empty-message
734
-
735
- "git rebase" has learned to use the sequencer backend by default,
736
- while allowing "--am" option to go back to the traditional "am"
737
- backend.
738
-
779
Will merge to 'master'.
740
- cf. <CABPp-BEnt4C_7XyxQKxk4aga=JjM9fXCE-7SFp7azO_v5-pQYw@mail.gmail.com>
780
781
--------------------------------------------------
782
[Discarded]