What's cooking (2021/08 #02)
Junio C Hamano committed
Aug 4, 2021 at 00:00 UTC
4cfdf76fec456f2e340c22e0eb2f744c507c4042
1 file changed
+313
-277
whats-cooking.txt
+313
-277
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2021, #01; Sun, 1)
3
-X-master-at: 940fe202adcbf9fa1825c648d97cbe1b90d26aec
4
-X-next-at: bfc8b41932b88e0d52dc2ef21dea9b33e3a8221b
2
+Subject: What's cooking in git.git (Aug 2021, #02; Tue, 3)
3
+X-master-at: 66262451ec94d30ac4b80eb3123549cf7a788afd
4
+X-next-at: a027d43cca25f39e7d37f671db37ed5e34a42f4d
5
6
-What's cooking in git.git (Aug 2021, #01; Sun, 1)
6
+What's cooking in git.git (Aug 2021, #02; Tue, 3)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -17,14 +17,7 @@ useful"). Do not read too much into a topic being in (or not in)
17
'seen'. The ones marked with '.' do not appear in any of the
18
integration branches, but I am still holding onto them.
19
20
-This cycle may have seen more non-trivial topics thrown at the list
21
-than ever; I have a strong suspicion that among the topics not in
22
-'next' and are not explicitly marked to be merged to 'next', there
23
-are a handful of them that have already been adequately reviewed but
24
-I simply missed the conclusion. There also may be some topics that
25
-only need the final nits picked before they are ready for the
26
-upcoming release. Help is greatly appreciated to identify and give
27
-final polish to them as needed.
20
+A preview release Git 2.33-rc0 has been tagged.
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -55,45 +48,181 @@ Release tarballs are available at:
48
https://www.kernel.org/pub/software/scm/git/
49
50
--------------------------------------------------
58
-[New Topics]
51
+[Graduated to 'master']
52
60
-* tb/mingw-rmdir-symlink-to-directory (2021-07-29) 1 commit
61
- - mingw: align symlinks-related rmdir() behavior with Linux
53
+* ab/bundle-tests (2021-07-22) 2 commits
54
+ (merged to 'next' on 2021-07-22 at 053b5d0ecf)
55
+ + bundle tests: use test_cmp instead of grep
56
+ + bundle tests: use ">file" not ": >file"
57
63
- Windows rmdir() equivalent behaves differently from POSIX ones in
64
- that when used on a symbolic link that points at a directory, the
65
- target directory gets removed, which has been corrected.
58
+ "git bundle" gained more test coverage.
59
67
- cf. <xmqqo8ak51mt.fsf@gitster.g>
68
- cf. <CAPig+cR9rb+ydc5age+2FzLtTtXhg1t77p5NrA7bqN0iyU6Kyg@mail.gmail.com>
60
61
+* fc/pull-no-rebase-merges-theirs-into-ours (2021-07-21) 1 commit
62
+ (merged to 'next' on 2021-07-28 at f8e6567082)
63
+ + doc: pull: fix rebase=false documentation
64
71
-* ab/getcwd-test (2021-07-30) 1 commit
72
- - t0001: fix broken not-quite getcwd(3) test in bed67874e2
65
+ Documentation fix for "git pull --rebase=no".
66
74
- Portability test update.
67
76
- Will merge to 'next'.
68
+* jk/check-pack-valid-before-opening-bitmap (2021-07-23) 1 commit
69
+ (merged to 'next' on 2021-07-28 at 98d5b4dc68)
70
+ + pack-bitmap: check pack validity when opening bitmap
71
72
+ A race between repacking and using pack bitmaps has been corrected.
73
79
-* ar/doc-markup-fix (2021-07-30) 1 commit
80
- - Documentation: render special characters correctly
74
82
- Doc mark-up fix.
75
+* jk/config-env-doc (2021-07-20) 3 commits
76
+ (merged to 'next' on 2021-07-22 at 45616c831e)
77
+ + doc/git-config: simplify "override" advice for FILES section
78
+ + doc/git-config: clarify GIT_CONFIG environment variable
79
+ + doc/git-config: explain --file instead of referring to GIT_CONFIG
80
84
- Will merge to 'next'.
81
+ Documentation around GIT_CONFIG has been updated.
82
83
87
-* rs/use-fspathhash (2021-07-30) 1 commit
88
- - use fspathhash() everywhere
84
+* js/ci-check-whitespace-updates (2021-07-14) 2 commits
85
+ (merged to 'next' on 2021-07-22 at cdc9aa0622)
86
+ + ci(check-whitespace): restrict to the intended commits
87
+ + ci(check-whitespace): stop requiring a read/write token
88
90
- Code simplification.
89
+ CI update.
90
92
- Will merge to 'next'.
91
+
92
+* jt/bulk-prefetch (2021-07-23) 2 commits
93
+ (merged to 'next' on 2021-07-28 at 26e28cab21)
94
+ + cache-tree: prefetch in partial clone read-tree
95
+ + unpack-trees: refactor prefetching code
96
+
97
+ "git read-tree" had a codepath where blobs are fetched one-by-one
98
+ from the promisor remote, which has been corrected to fetch in bulk.
99
+
100
+
101
+* pb/submodule-recurse-doc (2021-07-20) 1 commit
102
+ (merged to 'next' on 2021-07-22 at 4129e89833)
103
+ + doc: clarify description of 'submodule.recurse'
104
+
105
+ Doc update.
106
+
107
+
108
+* ps/perf-with-separate-output-directory (2021-07-02) 1 commit
109
+ (merged to 'next' on 2021-07-22 at af51ca0a39)
110
+ + perf: fix when running with TEST_OUTPUT_DIRECTORY
111
+
112
+ Test update.
113
+
114
+
115
+* tb/bitmap-type-filter-comment-fix (2021-07-20) 1 commit
116
+ (merged to 'next' on 2021-07-22 at 8428556149)
117
+ + pack-bitmap: clarify comment in filter_bitmap_exclude_type()
118
+
119
+ In-code comment update.
120
+
121
+--------------------------------------------------
122
+[New Topics]
123
+
124
+* ab/test-columns (2021-08-02) 3 commits
125
+ - test-lib.sh: use GIT_TEST_COLUMNS over COLUMNS
126
+ - test-lib-functions.sh: add a test_with_columns function
127
+ - test-lib-functions.sh: rename test_must_fail_acceptable()
128
+
129
+
130
+* cb/reftable-fixup (2021-08-02) 3 commits
131
+ - openbsd: allow reftable building with zlib 1.2.3
132
+ - reftable: clarify zlib version dependency
133
+ - fixup! Provide zlib's uncompress2 from compat/zlib-compat.c
134
+ (this branch uses hn/reftable.)
135
+
136
+
137
+* cb/t7508-regexp-fix (2021-08-02) 1 commit
138
+ - t7508: avoid non POSIX BRE
139
+
140
+
141
+* en/merge-strategy-docs (2021-08-03) 10 commits
142
+ - Update error message and code comment
143
+ - merge-strategies.txt: add coverage of the `ort` merge strategy
144
+ - git-rebase.txt: correct out-of-date and misleading text about renames
145
+ - merge-strategies.txt: fix simple capitalization error
146
+ - merge-strategies.txt: avoid giving special preference to patience algorithm
147
+ - merge-strategies.txt: do not imply using copy detection is desired
148
+ - merge-strategies.txt: update wording for the resolve strategy
149
+ - Documentation: edit awkward references to `git merge-recursive`
150
+ - directory-rename-detection.txt: small updates due to merge-ort optimizations
151
+ - git-rebase.txt: correct antiquated claims about --rebase-merges
152
+ (this branch is used by en/ort-becomes-the-default.)
153
+
154
+
155
+* en/ort-becomes-the-default (2021-08-03) 2 commits
156
+ - Change default merge backend from recursive to ort
157
+ - Update docs for change of default merge backend
158
+ (this branch uses en/merge-strategy-docs.)
159
+
160
+
161
+* js/log-protocol-version (2021-08-03) 1 commit
162
+ - connect, protocol: log negotiated protocol version
163
+
164
+
165
+* ow/clone-bare-origin (2021-08-03) 1 commit
166
+ - clone: Allow combining --bare and --origin
167
168
--------------------------------------------------
169
[Stalled]
170
171
+* gh/gitweb-branch-sort (2021-06-10) 1 commit
172
+ - gitweb: use HEAD as secondary sort key in git_get_heads_list()
173
+
174
+ Tie-break branches that point at the same object in the list of
175
+ branches on GitWeb to show the one pointed at by HEAD early.
176
+
177
+ Waiting for reviews.
178
+
179
+
180
+* lh/systemd-timers (2021-07-02) 3 commits
181
+ - maintenance: add support for systemd timers on Linux
182
+ - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
183
+ - cache.h: Introduce a generic "xdg_config_home_for(…)" function
184
+
185
+ "git maintenance" scheduler learned to use systemd timers as a
186
+ possible backend.
187
+
188
+ Waiting for reviews.
189
+
190
+
191
+* fc/completion-updates (2021-06-07) 4 commits
192
+ - completion: bash: add correct suffix in variables
193
+ - completion: bash: fix for multiple dash commands
194
+ - completion: bash: fix for suboptions with value
195
+ - completion: bash: fix prefix detection in branch.*
196
+
197
+ Command line completion updates.
198
+
199
+ Expecting a reroll.
200
+ cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
201
+
202
+
203
+* es/superproject-aware-submodules (2021-06-16) 5 commits
204
+ - SQUASH???
205
+ - submodule: cache superproject gitdir during 'update'
206
+ - submodule: cache superproject gitdir during absorbgitdirs
207
+ - introduce submodule.superprojectGitDir cache
208
+ - t7400-submodule-basic: modernize inspect() helper
209
+
210
+ A configuration variable in a submodule points at the location of
211
+ the superproject it is bound to (RFC).
212
+
213
+ Waiting for reviews.
214
+
215
+
216
+* en/zdiff3 (2021-06-15) 2 commits
217
+ - update documentation for new zdiff3 conflictStyle
218
+ - xdiff: implement a zealous diff3, or "zdiff3"
219
+
220
+ "Zealous diff3" style of merge conflict presentation has been added.
221
+
222
+ Expecting a reroll.
223
+ cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>
224
+
225
+
226
* ao/p4-avoid-decoding (2021-04-12) 2 commits
227
- git-p4: do not decode data from perforce by default
228
- git-p4: avoid decoding more data from perforce
@@ -117,15 +246,54 @@ Release tarballs are available at:
246
--------------------------------------------------
247
[Cooking]
248
249
+* tb/mingw-rmdir-symlink-to-directory (2021-08-02) 1 commit
250
+ (merged to 'next' on 2021-08-03 at a027d43cca)
251
+ + mingw: align symlinks-related rmdir() behavior with Linux
252
+
253
+ Windows rmdir() equivalent behaves differently from POSIX ones in
254
+ that when used on a symbolic link that points at a directory, the
255
+ target directory gets removed, which has been corrected.
256
+
257
+ Will merge to 'master'.
258
+
259
+
260
+* ab/getcwd-test (2021-07-30) 1 commit
261
+ (merged to 'next' on 2021-08-02 at 22ecd02929)
262
+ + t0001: fix broken not-quite getcwd(3) test in bed67874e2
263
+
264
+ Portability test update.
265
+
266
+ Will merge to 'master'.
267
+
268
+
269
+* ar/doc-markup-fix (2021-07-30) 1 commit
270
+ (merged to 'next' on 2021-08-02 at b99073fa75)
271
+ + Documentation: render special characters correctly
272
+
273
+ Doc mark-up fix.
274
+
275
+ Will merge to 'master'.
276
+
277
+
278
+* rs/use-fspathhash (2021-07-30) 1 commit
279
+ (merged to 'next' on 2021-08-02 at 72c388e867)
280
+ + use fspathhash() everywhere
281
+
282
+ Code simplification.
283
+
284
+ Will merge to 'master'.
285
+
286
+
287
* jc/bisect-sans-show-branch (2021-07-28) 2 commits
121
- - bisect: simplify return code from bisect_checkout()
122
- - bisect: do not run show-branch just to show the current commit
288
+ (merged to 'next' on 2021-08-02 at 89a8d9a47b)
289
+ + bisect: simplify return code from bisect_checkout()
290
+ + bisect: do not run show-branch just to show the current commit
291
292
"git bisect" spawned "git show-branch" only to pretty-print the
293
title of the commit after checking out the next version to be
294
tested; this has been rewritten in C.
295
128
- Will merge to 'next'.
296
+ Will cook in 'next'.
297
298
299
* jc/trivial-threeway-binary-merge (2021-07-28) 1 commit
@@ -141,30 +309,17 @@ Release tarballs are available at:
309
apply.c::three_way_merge().
310
311
144
-* os/bisect-runs-show-branch-without-pager (2021-07-27) 1 commit
145
- - bisect: disable pager while invoking show-branch
146
-
147
- When "git bisect" spawns "git show-branch" to pretty-print the
148
- title of the commit to be tested, it could have invoked user's
149
- pager if user configured to run pager while running show-branch.
150
- The invocation of show-branch has been changed to disable pager,
151
- even if one is configured.
152
-
153
- Will discard.
154
- This probably is unnecessary with the rewrite to get rid of the
155
- show-branch invocation altogether.
156
-
157
-
312
* ab/http-drop-old-curl (2021-07-30) 5 commits
159
- - http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
160
- - http: drop support for curl < 7.19.3 and < 7.17.0 (again)
161
- - http: drop support for curl < 7.19.4
162
- - http: drop support for curl < 7.16.0
163
- - http: drop support for curl < 7.11.1
313
+ (merged to 'next' on 2021-08-02 at b382ac042f)
314
+ + http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
315
+ + http: drop support for curl < 7.19.3 and < 7.17.0 (again)
316
+ + http: drop support for curl < 7.19.4
317
+ + http: drop support for curl < 7.16.0
318
+ + http: drop support for curl < 7.11.1
319
320
Support for ancient versions of cURL library has been dropped.
321
167
- Will merge to 'next'.
322
+ Will cook in 'next'.
323
324
325
* ab/lib-subtest (2021-07-21) 10 commits
@@ -179,29 +334,21 @@ Release tarballs are available at:
334
- Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
335
- Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
336
182
- Updates to the tests in t0000 to test th etest framework.
337
+ Updates to the tests in t0000 to test the test framework.
338
339
340
* ds/add-with-sparse-index (2021-07-29) 5 commits
186
- - add: remove ensure_full_index() with --renormalize
187
- - add: ignore outside the sparse-checkout in refresh()
188
- - pathspec: stop calling ensure_full_index
189
- - add: allow operating on a sparse-only index
190
- - t1092: test merge conflicts outside cone
341
+ (merged to 'next' on 2021-08-02 at ee3e1323bb)
342
+ + add: remove ensure_full_index() with --renormalize
343
+ + add: ignore outside the sparse-checkout in refresh()
344
+ + pathspec: stop calling ensure_full_index
345
+ + add: allow operating on a sparse-only index
346
+ + t1092: test merge conflicts outside cone
347
(this branch uses ds/commit-and-checkout-with-sparse-index.)
348
349
"git add" can work better with the sparse index.
350
195
- Will merge to 'next'.
196
-
197
-
198
-* fc/pull-no-rebase-merges-theirs-into-ours (2021-07-21) 1 commit
199
- (merged to 'next' on 2021-07-28 at f8e6567082)
200
- + doc: pull: fix rebase=false documentation
201
-
202
- Documentation fix for "git pull --rebase=no".
203
-
204
- Will merge to 'master'.
351
+ Will cook in 'next'.
352
353
354
* ab/only-single-progress-at-once (2021-07-23) 8 commits
@@ -225,7 +372,8 @@ Release tarballs are available at:
372
The code to show progress indicator in a few codepaths did not
373
cover between 0-100%, which has been corrected.
374
228
- Will merge to 'next'.
375
+ Waiting for a clarification.
376
+ cf. <xmqqbl6slmer.fsf@gitster.g>
377
378
379
* ar/submodule-add-config (2021-07-28) 1 commit
@@ -235,7 +383,7 @@ Release tarballs are available at:
383
Large part of "git submodule add" gets rewritten in C.
384
385
238
-* en/ort-perf-batch-15 (2021-07-30) 9 commits
386
+* en/ort-perf-batch-15 (2021-08-03) 9 commits
387
- merge-ort: remove compile-time ability to turn off usage of memory pools
388
- merge-ort: reuse path strings in pool_alloc_filespec
389
- merge-ort: store filepairs and filespecs in our mem_pool
@@ -249,27 +397,7 @@ Release tarballs are available at:
397
398
Final batch for "merge -sort" optimization.
399
252
- Looking good.
253
-
254
-
255
-* jk/check-pack-valid-before-opening-bitmap (2021-07-23) 1 commit
256
- (merged to 'next' on 2021-07-28 at 98d5b4dc68)
257
- + pack-bitmap: check pack validity when opening bitmap
258
-
259
- A race between repacking and using pack bitmaps has been corrected.
260
-
261
- Will merge to 'master'.
262
-
263
-
264
-* jt/bulk-prefetch (2021-07-23) 2 commits
265
- (merged to 'next' on 2021-07-28 at 26e28cab21)
266
- + cache-tree: prefetch in partial clone read-tree
267
- + unpack-trees: refactor prefetching code
268
-
269
- "git read-tree" had a codepath where blobs are fetched one-by-one
270
- from the promisor remote, which has been corrected to fetch in bulk.
271
-
272
- Will merge to 'master'.
400
+ Will merge to 'next'.
401
402
403
* pb/merge-autostash-more (2021-07-23) 4 commits
@@ -317,17 +445,22 @@ Release tarballs are available at:
445
location relative to Git installation (e.g. its $sharedir which is
446
$(prefix)/share), with "%(prefix)".
447
448
+ Will merge to 'next'.
449
+
450
321
-* zh/cherry-pick-help-is-only-for-sequencer (2021-07-26) 1 commit
451
+* zh/cherry-pick-help-is-only-for-sequencer (2021-08-03) 2 commits
452
+ - cherry-pick: use better advice message
453
- cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
454
455
"git cherry-pick" loses its state file when a stray
456
GIT_CHERRY_PICK_HELP environment is present, which has been
457
corrected.
458
459
+ Will merge to 'next'.
460
+
461
329
-* dt/submodule-diff-fixes (2021-07-26) 3 commits
330
- - diff --submodule=diff: do not print failure message twice
462
+* dt/submodule-diff-fixes (2021-08-02) 3 commits
463
+ - diff --submodule=diff: Don't print failure message twice
464
- diff --submodule=diff: do not fail on ever-initialied deleted submodules
465
- t4060: remove unused variable
466
@@ -335,44 +468,18 @@ Release tarballs are available at:
468
trying to run diff inside a submodule, when the user manually
469
removes the submodule directory.
470
338
- It is clear that a problem exists, but it is unclear if the
339
- proposed solution is a desirable one.
340
-
341
-
342
-* ab/bundle-tests (2021-07-22) 2 commits
343
- (merged to 'next' on 2021-07-22 at 053b5d0ecf)
344
- + bundle tests: use test_cmp instead of grep
345
- + bundle tests: use ">file" not ": >file"
346
-
347
- "git bundle" gained more test coverage.
348
-
349
- Will merge to 'master'.
350
-
351
-
352
-* es/config-based-hooks (2021-07-20) 9 commits
353
- - hook: implement hookcmd.<name>.skip
354
- - hook: teach 'hookcmd' config to alias hook scripts
355
- - hook: allow out-of-repo 'git hook' invocations
356
- - hook: include hooks from the config
357
- - hook: allow running non-native hooks
358
- - hook: treat hookdir hook specially
359
- - hook: introduce "git hook list"
360
- - hook: allow parallel hook execution
361
- - hook: run a list of hooks instead
362
- (this branch uses ab/config-based-hooks-base.)
363
-
364
- The "hooks defined via the configuration variables" topic.
471
+ Comments?
472
473
367
-* fs/ssh-signing (2021-07-28) 9 commits
368
- - ssh signing: add documentation
369
- - ssh signing: add more tests for logs, tags & push certs
474
+* fs/ssh-signing (2021-08-03) 9 commits
475
+ - ssh signing: test that gpg fails for unkown keys
476
+ - ssh signing: tests for logs, tags & push certs
477
- ssh signing: duplicate t7510 tests for commits
371
- - ssh signing: add test prereqs
372
- - ssh signing: parse ssh-keygen output and verify signatures
373
- - ssh signing: provide a textual representation of the signing key
478
+ - ssh signing: verify signatures using ssh-keygen
479
+ - ssh signing: provide a textual signing_key_id
480
- ssh signing: retrieve a default key from ssh-agent
375
- - ssh signing: add ssh signature format and signing using ssh keys
481
+ - ssh signing: add ssh key format and signing code
482
+ - ssh signing: add test prereqs
483
- ssh signing: preliminary refactoring and clean-up
484
485
Use ssh public crypto for object and push-cert signing.
@@ -380,43 +487,23 @@ Release tarballs are available at:
487
Comments?
488
489
383
-* pb/submodule-recurse-doc (2021-07-20) 1 commit
384
- (merged to 'next' on 2021-07-22 at 4129e89833)
385
- + doc: clarify description of 'submodule.recurse'
386
-
387
- Doc update.
388
-
389
- Will merge to 'master'.
390
-
391
-
392
-* tb/bitmap-type-filter-comment-fix (2021-07-20) 1 commit
393
- (merged to 'next' on 2021-07-22 at 8428556149)
394
- + pack-bitmap: clarify comment in filter_bitmap_exclude_type()
395
-
396
- In-code comment update.
397
-
398
- Will merge to 'master'.
399
-
400
-
401
-* hn/refs-test-cleanup (2021-07-22) 11 commits
402
- (merged to 'next' on 2021-07-28 at dd3af04939)
403
- + t6001: avoid direct file system access
404
- + t6500: use "ls -1" to snapshot ref database state
405
- + t7064: use update-ref -d to remove upstream branch
406
- + t1410: mark test as REFFILES
407
- + t1405: mark test for 'git pack-refs' as REFFILES
408
- + t1405: use 'git reflog exists' to check reflog existence
409
- (merged to 'next' on 2021-07-22 at 2ab8bc259a)
410
- + t2402: use ref-store test helper to create broken symlink
411
- + t3320: use git-symbolic-ref rather than filesystem access
412
- + t6120: use git-update-ref rather than filesystem access
413
- + t1503: mark symlink test as REFFILES
414
- + t6050: use git-update-ref rather than filesystem access
490
+* hn/refs-test-cleanup (2021-08-02) 11 commits
491
+ - t6001: avoid direct file system access
492
+ - t6500: use "ls -1" to snapshot ref database state
493
+ - t7064: use update-ref -d to remove upstream branch
494
+ - t1410: mark test as REFFILES
495
+ - t1405: mark test for 'git pack-refs' as REFFILES
496
+ - t1405: use 'git reflog exists' to check reflog existence
497
+ - t2402: use ref-store test helper to create broken symlink
498
+ - t3320: use git-symbolic-ref rather than filesystem access
499
+ - t6120: use git-update-ref rather than filesystem access
500
+ - t1503: mark symlink test as REFFILES
501
+ - t6050: use git-update-ref rather than filesystem access
502
503
A handful of tests that assumed implementation details of files
504
backend for refs have been cleaned up.
505
419
- Will merge to 'master'.
506
+ Will merge to 'next'.
507
508
509
* hn/reftable (2021-07-20) 26 commits
@@ -446,34 +533,14 @@ Release tarballs are available at:
533
- reftable: RFC: add LICENSE
534
- init-db: set the_repository->hash_algo early on
535
- hash.h: provide constants for the hash IDs
536
+ (this branch is used by cb/reftable-fixup.)
537
538
The "reftable" backend for the refs API.
539
540
Seems to break CI jobs in 'seen'.
541
542
455
-* jk/config-env-doc (2021-07-20) 3 commits
456
- (merged to 'next' on 2021-07-22 at 45616c831e)
457
- + doc/git-config: simplify "override" advice for FILES section
458
- + doc/git-config: clarify GIT_CONFIG environment variable
459
- + doc/git-config: explain --file instead of referring to GIT_CONFIG
460
-
461
- Documentation around GIT_CONFIG has been updated.
462
-
463
- Will merge to 'master'.
464
-
465
-
466
-* js/ci-check-whitespace-updates (2021-07-14) 2 commits
467
- (merged to 'next' on 2021-07-22 at cdc9aa0622)
468
- + ci(check-whitespace): restrict to the intended commits
469
- + ci(check-whitespace): stop requiring a read/write token
470
-
471
- CI update.
472
-
473
- Will merge to 'master'.
474
-
475
-
476
-* ab/refs-files-cleanup (2021-07-26) 11 commits
543
+* ab/refs-files-cleanup (2021-08-02) 11 commits
544
- refs/files: remove unused "errno != ENOTDIR" condition
545
- refs/files: remove unused "errno == EISDIR" code
546
- refs/files: remove unused "oid" in lock_ref_oid_basic()
@@ -487,8 +554,7 @@ Release tarballs are available at:
554
- refs/packet: add missing BUG() invocations to reflog callbacks
555
(this branch is used by hn/refs-errno-cleanup.)
556
490
- Waiting for a reroll.
491
- Patches are mostly good, but needs typofixes etc.
557
+ Will merge to 'next'.
558
559
560
* en/pull-conflicting-options (2021-07-22) 8 commits
@@ -506,13 +572,15 @@ Release tarballs are available at:
572
but went ahead and rebased when the history on other side is not a
573
descendant of our history. The series tries to fix them up.
574
575
+ Comments?
576
+
577
578
* bc/inactive-submodules (2021-07-02) 1 commit
579
- submodule: mark submodules with update=none as inactive
580
581
Usability update for inactive submodules.
582
515
- Under review.
583
+ Comments?
584
cf. <fc5ec100-1d42-4199-236e-7a99c9218f38@gmail.com>
585
cf. <bf1893ee-6973-d8b2-659e-bb239a0a9ae2@gmail.com>
586
@@ -543,24 +611,15 @@ Release tarballs are available at:
611
cf. <xmqqsg0ri5mq.fsf@gitster.g>
612
613
546
-* ps/perf-with-separate-output-directory (2021-07-02) 1 commit
547
- (merged to 'next' on 2021-07-22 at af51ca0a39)
548
- + perf: fix when running with TEST_OUTPUT_DIRECTORY
549
-
550
- Test update.
551
-
552
- Will merge to 'master'.
553
-
554
-
555
-* ab/bundle-doc (2021-07-20) 3 commits
614
+* ab/bundle-doc (2021-08-02) 4 commits
615
+ - bundle doc: replace "basis" with "prerequsite(s)"
616
- bundle doc: elaborate on rev<->ref restriction
617
- bundle doc: elaborate on object prerequisites
618
- bundle doc: rewrite the "DESCRIPTION" section
619
620
Doc update.
621
562
- Expecting a reroll.
563
- at least for the second patch.
622
+ Will merge to 'next'.
623
624
625
* ab/pack-stdin-packs-fix (2021-07-09) 2 commits
@@ -570,8 +629,7 @@ Release tarballs are available at:
629
Input validation of "git pack-objects --stdin-packs" has been
630
corrected.
631
573
- Ack?
574
- cf. <YND3h2l10PlnSNGJ@nand.local>
632
+ Will merge to 'next'.
633
634
635
* ds/commit-and-checkout-with-sparse-index (2021-07-20) 7 commits
@@ -649,7 +707,7 @@ Release tarballs are available at:
707
Comments?
708
709
652
-* ab/config-based-hooks-base (2021-06-29) 33 commits
710
+* ab/config-based-hooks-base (2021-08-03) 36 commits
711
- hooks: fix a TOCTOU in "did we run a hook?" heuristic
712
- receive-pack: convert receive hooks to hook.h
713
- post-update: use hook.h library
@@ -657,7 +715,9 @@ Release tarballs are available at:
715
- hooks: allow callers to capture output
716
- run-command: allow capturing of collated output
717
- reference-transaction: use hook.h to run hooks
660
- - transport: convert pre-push hook to use config
718
+ - hook tests: use a modern style for "pre-push" tests
719
+ - hook tests: test for exact "pre-push" hook input
720
+ - transport: convert pre-push hook to hook.h
721
- hook: convert 'post-rewrite' hook in sequencer.c to hook.h
722
- hook: provide stdin by string_list or callback
723
- run-command: add stdin callback for parallelization
@@ -666,24 +726,24 @@ Release tarballs are available at:
726
- run-command: allow stdin for run_processes_parallel
727
- run-command: remove old run_hook_{le,ve}() hook API
728
- receive-pack: convert push-to-checkout hook to hook.h
669
- - read-cache: convert post-index-change hook to use config
670
- - commit: use hook.h to execute hooks
729
+ - read-cache: convert post-index-change to use hook.h
730
+ - commit: convert {pre-commit,prepare-commit-msg} hook to hook.h
731
- git-p4: use 'git hook' to run hooks
732
- send-email: use 'git hook run' for 'sendemail-validate'
733
- git hook run: add an --ignore-missing flag
674
- - merge: use config-based hooks for post-merge hook
734
+ - merge: convert post-merge to use hook.h
735
- hooks: convert 'post-checkout' hook to hook library
676
- - am: convert applypatch hooks to use config
677
- - rebase: teach pre-rebase to use hook.h
736
+ - am: convert applypatch to use hook.h
737
+ - rebase: convert pre-rebase to use hook.h
738
- gc: use hook library for pre-auto-gc hook
739
- hook: add 'run' subcommand
740
- hook-list.h: add a generated list of hooks, like config-list.h
741
+ - hook.c users: use "hook_exists()" insted of "find_hook()"
742
- hook.c: add a hook_exists() wrapper and use it in bugreport.c
743
- hook.[ch]: move find_hook() to this new library
744
- Makefile: remove an out-of-date comment
745
- Makefile: stop hardcoding {command,config}-list.h
746
- Makefile: mark "check" target as .PHONY
686
- (this branch is used by es/config-based-hooks.)
747
748
Restructuring of (a subset of) Emily's config-based-hooks series,
749
to demonstrate that a series can be presented as a more logical and
@@ -692,10 +752,15 @@ Release tarballs are available at:
752
Waiting for reviews.
753
754
695
-* ab/serve-cleanup (2021-06-28) 8 commits
755
+* ab/serve-cleanup (2021-08-03) 13 commits
756
+ - fixup! {upload,receive}-pack tests: add --advertise-refs tests
757
+ - serve.[ch]: don't pass "struct strvec *keys" to commands
758
- upload-pack.c: convert to new serve.c "startup" config cb
759
+ - upload-pack: document and rename --advertise-refs
760
+ - {upload,receive}-pack tests: add --advertise-refs tests
761
+ - serve.[ch]: remove "serve_options", split up --advertise-refs code
762
+ - serve.c: move version line to advertise_capabilities()
763
- serve: add support for a "startup" git_config() callback
698
- - serve.c: add trace2 regions for advertise & command
764
- serve.c: add call_{advertise,command}() indirection
765
- serve: use designated initializers
766
- transport: use designated initializers
@@ -704,33 +769,6 @@ Release tarballs are available at:
769
770
Code clean-up around "git serve".
771
707
- Expecting a reroll.
708
- cf. <cover-0.8-00000000000-20210628T191634Z-avarab@gmail.com>
709
- cf. <87tul24iw2.fsf@evledraar.gmail.com>
710
-
711
-
712
-* es/superproject-aware-submodules (2021-06-16) 5 commits
713
- - SQUASH???
714
- - submodule: cache superproject gitdir during 'update'
715
- - submodule: cache superproject gitdir during absorbgitdirs
716
- - introduce submodule.superprojectGitDir cache
717
- - t7400-submodule-basic: modernize inspect() helper
718
-
719
- A configuration variable in a submodule points at the location of
720
- the superproject it is bound to (RFC).
721
-
722
- Waiting for reviews.
723
-
724
-
725
-* en/zdiff3 (2021-06-15) 2 commits
726
- - update documentation for new zdiff3 conflictStyle
727
- - xdiff: implement a zealous diff3, or "zdiff3"
728
-
729
- "Zealous diff3" style of merge conflict presentation has been added.
730
-
731
- Expecting a reroll.
732
- cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>
733
-
772
773
* pw/diff-color-moved-fix (2021-07-20) 12 commits
774
- diff --color-moved: intern strings
@@ -749,8 +787,10 @@ Release tarballs are available at:
787
Long-overdue correctness and performance update to "diff
788
--color-moved" feature.
789
790
+ Will merge to 'next'.
791
+
792
753
-* hn/refs-errno-cleanup (2021-07-26) 7 commits
793
+* hn/refs-errno-cleanup (2021-08-02) 7 commits
794
- refs: make errno output explicit for refs_resolve_ref_unsafe
795
- refs: explicitly return failure_errno from parse_loose_ref_contents
796
- refs: add failure_errno to refs_read_raw_ref() signature
@@ -763,7 +803,7 @@ Release tarballs are available at:
803
Futz with the way 'errno' is relied on in the refs API to carry the
804
failure modes up the callchain.
805
766
- Blocked by ab/refs-files-cleanup but otherwise is ready for 'next'.
806
+ Will merge to 'next'.
807
808
809
* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
@@ -802,38 +842,6 @@ Release tarballs are available at:
842
Will merge to 'master'.
843
844
805
-* gh/gitweb-branch-sort (2021-06-10) 1 commit
806
- - gitweb: use HEAD as secondary sort key in git_get_heads_list()
807
-
808
- Tie-break branches that point at the same object in the list of
809
- branches on GitWeb to show the one pointed at by HEAD early.
810
-
811
- Waiting for reviews.
812
-
813
-
814
-* lh/systemd-timers (2021-07-02) 3 commits
815
- - maintenance: add support for systemd timers on Linux
816
- - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
817
- - cache.h: Introduce a generic "xdg_config_home_for(…)" function
818
-
819
- "git maintenance" scheduler learned to use systemd timers as a
820
- possible backend.
821
-
822
- Waiting for reviews.
823
-
824
-
825
-* fc/completion-updates (2021-06-07) 4 commits
826
- - completion: bash: add correct suffix in variables
827
- - completion: bash: fix for multiple dash commands
828
- - completion: bash: fix for suboptions with value
829
- - completion: bash: fix prefix detection in branch.*
830
-
831
- Command line completion updates.
832
-
833
- Expecting a reroll.
834
- cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
835
-
836
-
845
* ab/update-submitting-patches (2021-07-22) 2 commits
846
(merged to 'next' on 2021-07-30 at 9ae2de7f7a)
847
+ SubmittingPatches: replace discussion of Travis with GitHub Actions
@@ -856,7 +864,7 @@ Release tarballs are available at:
864
option of "git for-each-ref" and its friends to be used in "git
865
cat-file --batch".
866
859
- Performance issues are being looked into.
867
+ Will merge to 'next'.
868
869
870
* jh/builtin-fsmonitor (2021-07-12) 35 commits
@@ -899,7 +907,7 @@ Release tarballs are available at:
907
An attempt to write and ship with a watchman equivalent tailored
908
for our use.
909
902
- So, where are we with this topic?
910
+ Expecting a reroll post 2.33 release.
911
912
913
* es/trace2-log-parent-process-name (2021-07-22) 2 commits
@@ -909,7 +917,7 @@ Release tarballs are available at:
917
trace2 logs learned to show parent process name to see in what
918
context Git was invoked.
919
912
- Looking good. Ready for 'next'?
920
+ Will merge to 'next'.
921
922
923
* ab/fsck-unexpected-type (2021-07-12) 21 commits
@@ -976,3 +984,31 @@ Release tarballs are available at:
984
+ t6050: use git-update-ref rather than filesystem access
985
986
Absorbed by the hn/refs-test-cleanup topic.
987
+
988
+
989
+* os/bisect-runs-show-branch-without-pager (2021-07-27) 1 commit
990
+ - bisect: disable pager while invoking show-branch
991
+
992
+ When "git bisect" spawns "git show-branch" to pretty-print the
993
+ title of the commit to be tested, it could have invoked user's
994
+ pager if user configured to run pager while running show-branch.
995
+ The invocation of show-branch has been changed to disable pager,
996
+ even if one is configured.
997
+
998
+ Will discard.
999
+ This probably is unnecessary with the rewrite to get rid of the
1000
+ show-branch invocation altogether.
1001
+
1002
+
1003
+* es/config-based-hooks (2021-07-20) 9 commits
1004
+ - hook: implement hookcmd.<name>.skip
1005
+ - hook: teach 'hookcmd' config to alias hook scripts
1006
+ - hook: allow out-of-repo 'git hook' invocations
1007
+ - hook: include hooks from the config
1008
+ - hook: allow running non-native hooks
1009
+ - hook: treat hookdir hook specially
1010
+ - hook: introduce "git hook list"
1011
+ - hook: allow parallel hook execution
1012
+ - hook: run a list of hooks instead
1013
+
1014
+ Discarded to give room for updated ab/config-based-hooks-base.