What's cooking (2020/03 #02)
Junio C Hamano committed
Mar 5, 2020 at 13:16 UTC
a9aa89f29ce8f9515a2d37fe4a57447028d0e7ba
1 file changed
+175
-345
whats-cooking.txt
+175
-345
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2020, #01; Tue, 3)
4
-X-master-at: 2f268890c2cd2f115424936bbee27f8269080e5e
5
-X-next-at: 5e7596f4ac6ed24f8c8b715a297eeb8623e7c204
3
+Subject: What's cooking in git.git (Mar 2020, #02; Thu, 5)
4
+X-master-at: 076cbdcd739aeb33c1be87b73aebae5e43d7bcc5
5
+X-next-at: e46b2d99d2742df792ec4089722921bf939458c2
6
7
-What's cooking in git.git (Mar 2020, #01; Tue, 3)
7
+What's cooking in git.git (Mar 2020, #02; Thu, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,12 +12,7 @@ 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.
15
+2.26-rc0 has been tagged.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -27,201 +22,157 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
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
25
+* ag/rebase-remove-redundant-code (2020-02-26) 1 commit
26
+ (merged to 'next' on 2020-02-27 at b1f5289b67)
27
+ + builtin/rebase: remove a call to get_oid() on `options.switch_to'
28
35
- Test update.
29
+ Code reduction.
30
31
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
32
+* bc/wildcard-credential (2020-02-20) 5 commits
33
+ (merged to 'next' on 2020-02-25 at ba3706cb90)
34
+ + credential: allow wildcard patterns when matching config
35
+ + credential: use the last matching username in the config
36
+ + t0300: add tests for some additional cases
37
+ + t1300: add test for urlmatch with multiple wildcards
38
+ + mailmap: add an additional email address for brian m. carlson
39
43
- Fix for a bug revealed by a recent change to make the protocol v2
44
- the default.
40
+ A configuration element used for credential subsystem can now use
41
+ wildcard pattern to specify for which set of URLs the entry
42
+ applies.
43
44
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
45
+* be/describe-multiroot (2020-02-26) 1 commit
46
+ (merged to 'next' on 2020-02-27 at b476663ffc)
47
+ + describe: don't abort too early when searching tags
48
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.
49
+ "git describe" in a repository with multiple root commits sometimes
50
+ gave up looking for the best tag to describe a given commit with
51
+ too early, which has been adjusted.
52
53
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
54
+* ds/sparse-add (2020-02-20) 5 commits
55
+ (merged to 'next' on 2020-02-25 at de68d14e77)
56
+ + sparse-checkout: allow one-character directories in cone mode
57
+ (merged to 'next' on 2020-02-14 at 3799757bbe)
58
+ + sparse-checkout: work with Windows paths
59
+ + sparse-checkout: create 'add' subcommand
60
+ + sparse-checkout: extract pattern update from 'set' subcommand
61
+ + sparse-checkout: extract add_patterns_from_input()
62
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.
63
+ "git sparse-checkout" learned a new "add" subcommand.
64
65
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
66
+* es/do-not-let-rebase-switch-to-protected-branch (2020-02-24) 2 commits
67
+ (merged to 'next' on 2020-02-27 at 4b0009b609)
68
+ + rebase: refuse to switch to branch already checked out elsewhere
69
+ + t3400: make test clean up after itself
70
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.
71
+ "git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
72
+ checked it out, even when the BRANCH is checked out in a different
73
+ worktree. This has been corrected.
74
75
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()
76
+* es/recursive-single-branch-clone (2020-02-25) 2 commits
77
+ (merged to 'next' on 2020-02-27 at 8e8fcca7cd)
78
+ + clone: pass --single-branch during --recurse-submodules
79
+ + submodule--helper: use C99 named initializer
80
99
- Code cleanup.
81
+ "git clone --recurse-submodules --single-branch" now uses the same
82
+ single-branch option when cloning the submodules.
83
84
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
85
+* es/worktree-avoid-duplication-fix (2020-02-24) 3 commits
86
+ (merged to 'next' on 2020-02-25 at 74c612837a)
87
+ + worktree: don't allow "add" validation to be fooled by suffix matching
88
+ + worktree: add utility to find worktree by pathname
89
+ + worktree: improve find_worktree() documentation
90
106
- Update to doc-diff.
91
+ In rare cases "git worktree add <path>" could think that <path>
92
+ was already a registered worktree even when it wasn't and refuse
93
+ to add the new worktree. This has been corrected.
94
95
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
96
+* hi/gpg-use-check-signature (2020-02-28) 1 commit
97
+ (merged to 'next' on 2020-03-02 at 273fb30874)
98
+ + Revert "gpg-interface: prefer check_signature() for GPG verification"
99
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.
100
+ "git merge signed-tag" while lacking the public key started to say
101
+ "No signature", which was utterly wrong. This regression has been
102
+ reverted.
103
104
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
105
+* hv/receive-denycurrent-everywhere (2020-02-24) 3 commits
106
+ (merged to 'next' on 2020-02-25 at 84e35c4980)
107
+ + receive.denyCurrentBranch: respect all worktrees
108
+ + t5509: use a bare repository for test push target
109
+ + get_main_worktree(): allow it to be called in the Git directory
110
141
- Doc markup fix.
111
+ "git push" should stop from updating a branch that is checked out
112
+ when receive.denyCurrentBranch configuration is set, but it failed
113
+ to pay attention to checkouts in secondary worktrees. This has
114
+ been corrected.
115
116
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
117
+* jk/nth-packed-object-id (2020-02-24) 10 commits
118
+ (merged to 'next' on 2020-02-27 at 8f1e796030)
119
+ + packfile: drop nth_packed_object_sha1()
120
+ + packed_object_info(): use object_id internally for delta base
121
+ + packed_object_info(): use object_id for returning delta base
122
+ + pack-check: push oid lookup into loop
123
+ + pack-check: convert "internal error" die to a BUG()
124
+ + pack-bitmap: use object_id when loading on-disk bitmaps
125
+ + pack-objects: use object_id struct in pack-reuse code
126
+ + pack-objects: convert oe_set_delta_ext() to use object_id
127
+ + pack-objects: read delta base oid into object_id struct
128
+ + nth_packed_object_oid(): use customary integer return
129
148
- Code style cleanup.
130
+ Code cleanup to use "struct object_id" more by replacing use of
131
+ "char *sha1"
132
133
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`
134
+* js/ci-windows-update (2020-02-27) 3 commits
135
+ (merged to 'next' on 2020-02-27 at 691f1c929c)
136
+ + Azure Pipeline: switch to the latest agent pools
137
+ + ci: prevent `perforce` from being quarantined
138
+ + t/lib-httpd: avoid using macOS' sed
139
157
- Code cleanup.
140
+ Updates to the CI settings.
141
142
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
143
+* mr/bisect-in-c-1 (2020-02-19) 12 commits
144
+ (merged to 'next' on 2020-02-25 at 7e9e7950fd)
145
+ + bisect: libify `bisect_next_all`
146
+ + bisect: libify `handle_bad_merge_base` and its dependents
147
+ + bisect: libify `check_good_are_ancestors_of_bad` and its dependents
148
+ + bisect: libify `check_merge_bases` and its dependents
149
+ + bisect: libify `bisect_checkout`
150
+ + bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
151
+ + bisect--helper: return error codes from `cmd_bisect__helper()`
152
+ + bisect: add enum to represent bisect returning codes
153
+ + bisect--helper: introduce new `decide_next()` function
154
+ + bisect: use the standard 'if (!var)' way to check for 0
155
+ + bisect--helper: change `retval` to `res`
156
+ + bisect--helper: convert `vocab_*` char pointers to char arrays
157
164
- Code cleanup.
158
+ Underlying machinery of "git bisect--helper" is being refactored
159
+ into pieces that are more easily reused.
160
161
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
162
+* rs/commit-graph-code-simplification (2020-02-27) 1 commit
163
+ (merged to 'next' on 2020-02-27 at f298c6ed49)
164
+ + commit-graph: use progress title directly
165
172
- Code cleanup.
166
+ Code simplfication.
167
168
--------------------------------------------------
169
[New Topics]
170
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
-
171
+* dr/push-remote-ref-update (2020-03-03) 1 commit
172
+ - remote: drop "explicit" parameter from remote_ref_for_branch()
173
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.
174
+ Code clean-up.
175
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
-
207
-* es/outside-repo-errmsg-hints (2020-03-03) 1 commit
208
- - prefix_path: show gitdir if worktree unavailable
209
-
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'.
176
177
--------------------------------------------------
178
[Stalled]
@@ -274,19 +225,6 @@ of the repositories listed at
225
cf. <20200123042906.GA29009@generichostname>
226
227
277
-* tb/commit-graph-split-merge (2020-02-12) 3 commits
278
- - builtin/commit-graph.c: support '--input=none'
279
- - builtin/commit-graph.c: introduce '--input=<source>'
280
- - builtin/commit-graph.c: support '--split[=<strategy>]'
281
-
282
- The code to write out the commit-graph has been taught a few
283
- options to control if the resulting graph chains should be merged
284
- or a single new incremental graph is created.
285
-
286
- Waiting for the discussion to settle.
287
- cf. <20200212205028.GE4364@syl.local>
288
-
289
-
228
* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
229
- git-p4: add RCS keyword status message
230
- git-p4: add p4 submit hooks
@@ -340,22 +278,67 @@ of the repositories listed at
278
--------------------------------------------------
279
[Cooking]
280
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'
281
+* tb/commit-graph-split-merge (2020-03-05) 3 commits
282
+ - builtin/commit-graph.c: support '--input=none'
283
+ - builtin/commit-graph.c: introduce '--input=<source>'
284
+ - builtin/commit-graph.c: support '--split[=<strategy>]'
285
347
- Code reduction.
286
+ The code to write out the commit-graph has been taught a few
287
+ options to control if the resulting graph chains should be merged
288
+ or a single new incremental graph is created.
289
+
290
+ .
291
+
292
+
293
+* ah/force-pull-rebase-configuration (2020-03-05) 2 commits
294
+ - SQUASH???
295
+ - pull: warn if the user didn't say whether to rebase or to merge
296
+
297
+ "git pull" learned to warn when no pull.rebase configuration
298
+ exists, and neither --[no-]rebase nor --ff-only is given (which
299
+ would result a merge).
300
+
301
+ Needs to add some tests.
302
+
303
+
304
+* hd/show-one-mergetag-fix (2020-03-02) 1 commit
305
+ (merged to 'next' on 2020-03-02 at 12fe907f8d)
306
+ + show_one_mergetag: print non-parent in hex form.
307
+
308
+ "git show" and others gave an object name in raw format in its
309
+ error output, which has been corrected to give it in hex.
310
311
Will merge to 'master'.
312
313
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
314
+* tg/retire-scripted-stash (2020-03-05) 2 commits
315
+ (merged to 'next' on 2020-03-05 at 8e82eb9dec)
316
+ + stash: remove the stash.useBuiltin setting
317
+ + stash: get git_stash_config at the top level
318
+
319
+ "git stash" has kept an escape hatch to use the scripted version
320
+ for a few releases, which got stale. It has been removed.
321
+
322
+ Will merge to 'master'.
323
+
324
+
325
+* es/outside-repo-errmsg-hints (2020-03-03) 1 commit
326
+ - prefix_path: show gitdir if worktree unavailable
327
+
328
+ An earlier update to show the location of working tree in the error
329
+ message did not consider the possibility that a git command may be
330
+ run in a bare repository, which has been corrected.
331
+
332
+ May want a test or two.
333
358
- Updates to the CI settings.
334
+
335
+* rs/show-progress-in-dumb-http-fetch (2020-03-03) 1 commit
336
+ (merged to 'next' on 2020-03-05 at 98ed6360e7)
337
+ + remote-curl: show progress for fetches over dumb HTTP
338
+
339
+ "git fetch" over HTTP walker protocol did not show any progress
340
+ output. We inherently do not know how much work remains, but still
341
+ we can show something not to bore users.
342
343
Will merge to 'master'.
344
@@ -384,24 +367,13 @@ of the repositories listed at
367
Will merge to 'master'.
368
369
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.
370
+* js/https-proxy-config (2020-03-05) 2 commits
371
+ - http: add environment variable support for HTTPS proxies
372
+ - http: add client cert support for HTTPS proxies
373
374
A handful of options to configure SSL when talking to proxies have
375
been added.
376
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
-
377
378
* jc/doc-single-h-is-for-help (2020-02-27) 1 commit
379
- Documentation: clarify that `-h` alone stands for `help`
@@ -413,17 +385,6 @@ of the repositories listed at
385
documentation has been updated in an attempt to clarify this.
386
387
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
-
388
* rt/format-zero-length-fix (2020-02-28) 2 commits
389
(merged to 'next' on 2020-03-02 at a4070ef573)
390
+ config.mak.dev: re-enable -Wformat-zero-length
@@ -466,9 +427,7 @@ of the repositories listed at
427
The "--fork-point" mode of "git rebase" regressed when the command
428
was rewritten in C back in 2.20 era, which has been corrected.
429
469
- Will merge to 'master'.
470
- Was waiting for a response to "shouldn't this be sufficient?" but
471
- I think it should.
430
+ Will cook in 'next'.
431
432
433
* am/mingw-poll-fix (2020-02-27) 1 commit
@@ -496,32 +455,6 @@ of the repositories listed at
455
Will merge to 'master'.
456
457
499
-* bc/wildcard-credential (2020-02-20) 5 commits
500
- (merged to 'next' on 2020-02-25 at ba3706cb90)
501
- + credential: allow wildcard patterns when matching config
502
- + credential: use the last matching username in the config
503
- + t0300: add tests for some additional cases
504
- + t1300: add test for urlmatch with multiple wildcards
505
- + mailmap: add an additional email address for brian m. carlson
506
-
507
- A configuration element used for credential subsystem can now use
508
- wildcard pattern to specify for which set of URLs the entry
509
- applies.
510
-
511
- Will merge to 'master'.
512
-
513
-
514
-* es/recursive-single-branch-clone (2020-02-25) 2 commits
515
- (merged to 'next' on 2020-02-27 at 8e8fcca7cd)
516
- + clone: pass --single-branch during --recurse-submodules
517
- + submodule--helper: use C99 named initializer
518
-
519
- "git clone --recurse-submodules --single-branch" now uses the same
520
- single-branch option when cloning the submodules.
521
-
522
- Will merge to 'master'.
523
-
524
-
458
* jc/describe-misnamed-annotated-tag (2020-02-20) 1 commit
459
(merged to 'next' on 2020-03-02 at b4e2ca6a46)
460
+ describe: force long format for a name based on a mislocated tag
@@ -535,7 +468,7 @@ of the repositories listed at
468
behavior of the command has been changed to use the "long" form
469
i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse.
470
538
- Will merge to 'master'.
471
+ Will cook in 'next'.
472
473
474
* pb/recurse-submodules-fix (2020-02-19) 6 commits
@@ -586,64 +519,6 @@ of the repositories listed at
519
a reverted change to the gpg interface API.
520
521
589
-* es/do-not-let-rebase-switch-to-protected-branch (2020-02-24) 2 commits
590
- (merged to 'next' on 2020-02-27 at 4b0009b609)
591
- + rebase: refuse to switch to branch already checked out elsewhere
592
- + t3400: make test clean up after itself
593
-
594
- "git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
595
- checked it out, even when the BRANCH is checked out in a different
596
- worktree. This has been corrected.
597
-
598
- Will merge to 'master'.
599
-
600
-
601
-* es/worktree-avoid-duplication-fix (2020-02-24) 3 commits
602
- (merged to 'next' on 2020-02-25 at 74c612837a)
603
- + worktree: don't allow "add" validation to be fooled by suffix matching
604
- + worktree: add utility to find worktree by pathname
605
- + worktree: improve find_worktree() documentation
606
-
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
-
613
-
614
-* hv/receive-denycurrent-everywhere (2020-02-24) 3 commits
615
- (merged to 'next' on 2020-02-25 at 84e35c4980)
616
- + receive.denyCurrentBranch: respect all worktrees
617
- + t5509: use a bare repository for test push target
618
- + get_main_worktree(): allow it to be called in the Git directory
619
-
620
- "git push" should stop from updating a branch that is checked out
621
- when receive.denyCurrentBranch configuration is set, but it failed
622
- to pay attention to checkouts in secondary worktrees. This has
623
- been corrected.
624
-
625
- Will merge to 'master'.
626
-
627
-
628
-* jk/nth-packed-object-id (2020-02-24) 10 commits
629
- (merged to 'next' on 2020-02-27 at 8f1e796030)
630
- + packfile: drop nth_packed_object_sha1()
631
- + packed_object_info(): use object_id internally for delta base
632
- + packed_object_info(): use object_id for returning delta base
633
- + pack-check: push oid lookup into loop
634
- + pack-check: convert "internal error" die to a BUG()
635
- + pack-bitmap: use object_id when loading on-disk bitmaps
636
- + pack-objects: use object_id struct in pack-reuse code
637
- + pack-objects: convert oe_set_delta_ext() to use object_id
638
- + pack-objects: read delta base oid into object_id struct
639
- + nth_packed_object_oid(): use customary integer return
640
-
641
- Code cleanup to use "struct object_id" more by replacing use of
642
- "char *sha1"
643
-
644
- Will merge to 'master'.
645
-
646
-
522
* kk/complete-diff-color-moved (2020-02-24) 1 commit
523
(merged to 'next' on 2020-03-02 at 1bdb401f6a)
524
+ completion: add diff --color-moved[-ws]
@@ -653,20 +528,8 @@ of the repositories listed at
528
Will merge to 'master'.
529
530
656
-* be/describe-multiroot (2020-02-26) 1 commit
657
- (merged to 'next' on 2020-02-27 at b476663ffc)
658
- + describe: don't abort too early when searching tags
659
-
660
- "git describe" in a repository with multiple root commits sometimes
661
- gave up looking for the best tag to describe a given commit with
662
- too early, which has been adjusted.
663
-
664
- Will merge to 'master'.
665
-
666
-
667
-* hw/advise-ng (2020-03-02) 5 commits
531
+* hw/advise-ng (2020-03-05) 4 commits
532
- tag: use new advice API to check visibility
669
- - SQUASH???
533
- advice: revamp advise API
534
- advice: change "setupStreamFailure" to "setUpstreamFailure"
535
- advice: extract vadvise() from advise()
@@ -674,19 +537,7 @@ of the repositories listed at
537
Revamping of the advise API to allow more systematic enumeration of
538
advice knobs in the future.
539
677
-
678
-* ds/sparse-add (2020-02-20) 5 commits
679
- (merged to 'next' on 2020-02-25 at de68d14e77)
680
- + sparse-checkout: allow one-character directories in cone mode
681
- (merged to 'next' on 2020-02-14 at 3799757bbe)
682
- + sparse-checkout: work with Windows paths
683
- + sparse-checkout: create 'add' subcommand
684
- + sparse-checkout: extract pattern update from 'set' subcommand
685
- + sparse-checkout: extract add_patterns_from_input()
686
-
687
- "git sparse-checkout" learned a new "add" subcommand.
688
-
689
- Will merge to 'master'.
540
+ Will merge to 'next'.
541
542
543
* hn/reftable (2020-02-26) 6 commits
@@ -741,27 +592,6 @@ of the repositories listed at
592
Breakage due to byte-order dependency reported.
593
594
744
-* mr/bisect-in-c-1 (2020-02-19) 12 commits
745
- (merged to 'next' on 2020-02-25 at 7e9e7950fd)
746
- + bisect: libify `bisect_next_all`
747
- + bisect: libify `handle_bad_merge_base` and its dependents
748
- + bisect: libify `check_good_are_ancestors_of_bad` and its dependents
749
- + bisect: libify `check_merge_bases` and its dependents
750
- + bisect: libify `bisect_checkout`
751
- + bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
752
- + bisect--helper: return error codes from `cmd_bisect__helper()`
753
- + bisect: add enum to represent bisect returning codes
754
- + bisect--helper: introduce new `decide_next()` function
755
- + bisect: use the standard 'if (!var)' way to check for 0
756
- + bisect--helper: change `retval` to `res`
757
- + bisect--helper: convert `vocab_*` char pointers to char arrays
758
-
759
- Underlying machinery of "git bisect--helper" is being refactored
760
- into pieces that are more easily reused.
761
-
762
- Will merge to 'master'.
763
-
764
-
595
* am/pathspec-f-f-more (2020-02-19) 8 commits
596
(merged to 'next' on 2020-03-02 at 33ff7e29f0)
597
+ stash push: support the --pathspec-from-file option