What's cooking (2021/10 #07)
Junio C Hamano committed
Oct 29, 2021 at 16:34 UTC
9fed826e4336e0c67e7dbf146088151c9e189b81
1 file changed
+386
-516
whats-cooking.txt
+386
-516
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2021, #06; Mon, 25)
4
-X-master-at: e9e5ba39a78c8f5057262d49e261b42a8660d5b9
5
-X-next-at: c40950c09aa26fafb743328ce2dee3ba26b22eec
3
+Subject: What's cooking in git.git (Oct 2021, #07; Fri, 29)
4
+X-master-at: 7e27bd589d328b9daf154c2444d1a86ec3afedb0
5
+X-next-at: 81b53c28077674bc88b86c3c3dcc2dc94f93888f
6
7
-What's cooking in git.git (Oct 2021, #06; Mon, 25)
7
+What's cooking in git.git (Oct 2021, #07; Fri, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,9 +18,9 @@ useful"). Do not read too much into a topic being in (or not in)
18
'seen'. The ones marked with '.' do not appear in any of the
19
integration branches, but I am still holding onto them.
20
21
-The fifteenth batch of topics are in 'master'. I expect that this
22
-is more-or-less what we can expect in the -rc0, unless there is a
23
-hotfix to what's already merged.
21
+Git 2.34-rc0 has been tagged. There are still a few topics that
22
+want to be in the upcoming release in 'next', but from here on,
23
+let's concentrate more on fixes other than shiny new features.
24
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
@@ -53,302 +53,11 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
56
-* ab/fix-commit-error-message-upon-unwritable-object-store (2021-10-12) 2 commits
57
- (merged to 'next' on 2021-10-14 at 08c52f5cd5)
58
- + commit: fix duplication regression in permission error output
59
- + unwritable tests: assert exact error output
60
-
61
- "git commit" gave duplicated error message when the object store
62
- was unwritable, which has been corrected.
63
-
64
-
65
-* ab/fix-make-lint-docs (2021-10-15) 4 commits
66
- (merged to 'next' on 2021-10-18 at 22ebb3213f)
67
- + doc lint: make "lint-docs" non-.PHONY
68
- + doc build: speed up "make lint-docs"
69
- + doc lint: emit errors on STDERR
70
- + doc lint: fix error-hiding regression
71
-
72
- Build fix.
73
-
74
-
75
-* ab/fsck-unexpected-type (2021-10-01) 17 commits
76
- (merged to 'next' on 2021-10-14 at 10edc78c9c)
77
- + fsck: report invalid object type-path combinations
78
- + fsck: don't hard die on invalid object types
79
- + object-file.c: stop dying in parse_loose_header()
80
- + object-file.c: return ULHR_TOO_LONG on "header too long"
81
- + object-file.c: use "enum" return type for unpack_loose_header()
82
- + object-file.c: simplify unpack_loose_short_header()
83
- + object-file.c: make parse_loose_header_extended() public
84
- + object-file.c: return -1, not "status" from unpack_loose_header()
85
- + object-file.c: don't set "typep" when returning non-zero
86
- + cat-file tests: test for current --allow-unknown-type behavior
87
- + cat-file tests: add corrupt loose object test
88
- + cat-file tests: test for missing/bogus object with -t, -s and -p
89
- + cat-file tests: move bogus_* variable declarations earlier
90
- + fsck tests: test for garbage appended to a loose object
91
- + fsck tests: test current hash/type mismatch behavior
92
- + fsck tests: refactor one test to use a sub-repo
93
- + fsck tests: add test for fsck-ing an unknown type
94
-
95
- "git fsck" has been taught to report mismatch between expected and
96
- actual types of an object better.
97
-
98
-
99
-* ab/mark-leak-free-tests (2021-10-12) 10 commits
100
- (merged to 'next' on 2021-10-18 at c522807d5d)
101
- + leak tests: mark some misc tests as passing with SANITIZE=leak
102
- + leak tests: mark various "generic" tests as passing with SANITIZE=leak
103
- + leak tests: mark some read-tree tests as passing with SANITIZE=leak
104
- + leak tests: mark some ls-files tests as passing with SANITIZE=leak
105
- + leak tests: mark all checkout-index tests as passing with SANITIZE=leak
106
- + leak tests: mark all trace2 tests as passing with SANITIZE=leak
107
- + leak tests: mark all ls-tree tests as passing with SANITIZE=leak
108
- + leak tests: run various "test-tool" tests in t00*.sh SANITIZE=leak
109
- + leak tests: run various built-in tests in t00*.sh SANITIZE=leak
110
- + Merge branch 'ab/sanitize-leak-ci' into ab/mark-leak-free-tests
111
-
112
- Bunch of tests are marked as "passing leak check".
113
-
114
-
115
-* ab/mark-leak-free-tests-more (2021-10-07) 8 commits
116
- (merged to 'next' on 2021-10-18 at fe798f77b8)
117
- + merge: add missing strbuf_release()
118
- + ls-files: add missing string_list_clear()
119
- + ls-files: fix a trivial dir_clear() leak
120
- + tests: fix test-oid-array leak, test in SANITIZE=leak
121
- + tests: fix a memory leak in test-oidtree.c
122
- + tests: fix a memory leak in test-parse-options.c
123
- + tests: fix a memory leak in test-prio-queue.c
124
- + Merge branch 'ab/sanitize-leak-ci' into ab/mark-leak-free-tests-more
125
-
126
- Bunch of tests are marked as "passing leak check".
127
-
128
-
129
-* ab/parse-options-cleanup (2021-10-08) 10 commits
130
- (merged to 'next' on 2021-10-18 at 305d339ad9)
131
- + parse-options: change OPT_{SHORT,UNSET} to an enum
132
- + parse-options tests: test optname() output
133
- + parse-options.[ch]: make opt{bug,name}() "static"
134
- + commit-graph: stop using optname()
135
- + parse-options.c: move optname() earlier in the file
136
- + parse-options.h: make the "flags" in "struct option" an enum
137
- + parse-options.c: use exhaustive "case" arms for "enum parse_opt_result"
138
- + parse-options.[ch]: consistently use "enum parse_opt_result"
139
- + parse-options.[ch]: consistently use "enum parse_opt_flags"
140
- + parse-options.h: move PARSE_OPT_SHELL_EVAL between enums
141
-
142
- Random changes to parse-options implementation.
143
-
144
-
145
-* ab/pkt-line-cleanup (2021-10-15) 2 commits
146
- (merged to 'next' on 2021-10-18 at 79b07663da)
147
- + pkt-line.[ch]: remove unused packet_read_line_buf()
148
- + pkt-line.[ch]: remove unused packet_buf_write_len()
149
-
150
- Code clean-up.
151
-
152
-
153
-* ab/test-cleanly-recreate-trash-directory (2021-10-15) 1 commit
154
- (merged to 'next' on 2021-10-18 at 6fdb43973b)
155
- + test-lib.sh: try to re-chmod & retry on failed trash removal
156
-
157
- Improve test framework around unwritable directories.
158
-
159
-
160
-* ab/test-lib-diff-cleanup (2021-10-15) 2 commits
161
- (merged to 'next' on 2021-10-18 at 5229c5d01d)
162
- + tests: stop using top-level "README" and "COPYING" files
163
- + "lib-diff" tests: make "README" and "COPYING" test data smaller
164
-
165
- Test clean-up.
166
-
167
-
168
-* ab/unpack-trees-leakfix (2021-10-13) 4 commits
169
- (merged to 'next' on 2021-10-14 at bb54827704)
170
- + sequencer: fix a memory leak in do_reset()
171
- + sequencer: add a "goto cleanup" to do_reset()
172
- + unpack-trees: don't leak memory in verify_clean_subdirectory()
173
- + Merge branch 'ab/sanitize-leak-ci' into ab/unpack-trees-leakfix
56
+* ab/fix-make-lint-docs (2021-10-27) 1 commit
57
+ (merged to 'next' on 2021-10-27 at 04f0be2a8b)
58
+ + Documentation/Makefile: fix lint-docs mkdir dependency
59
175
- Leakfix.
176
-
177
-
178
-* da/mergetools-special-case-xxdiff-exit-128 (2021-10-13) 1 commit
179
- (merged to 'next' on 2021-10-18 at 0dd8a08c63)
180
- + mergetools/xxdiff: prevent segfaults from stopping difftool
181
-
182
- The xxdiff difftool backend can exit with status 128, which the
183
- difftool-helper that launches the backend takes as a significant
184
- failure, when it is not significant at all. Work it around.
185
-
186
-
187
-* fs/ssh-signing (2021-09-10) 9 commits
188
- (merged to 'next' on 2021-10-11 at b456b95672)
189
- + ssh signing: test that gpg fails for unknown keys
190
- + ssh signing: tests for logs, tags & push certs
191
- + ssh signing: duplicate t7510 tests for commits
192
- + ssh signing: verify signatures using ssh-keygen
193
- + ssh signing: provide a textual signing_key_id
194
- + ssh signing: retrieve a default key from ssh-agent
195
- + ssh signing: add ssh key format and signing code
196
- + ssh signing: add test prereqs
197
- + ssh signing: preliminary refactoring and clean-up
198
- (this branch is used by fs/ssh-signing-fix and fs/ssh-signing-key-lifetime.)
199
-
200
- Use ssh public crypto for object and push-cert signing.
201
-
202
-
203
-* fs/ssh-signing-fix (2021-10-18) 5 commits
204
- (merged to 'next' on 2021-10-18 at 5ffa706433)
205
- + gpg-interface: fix leak of strbufs in get_ssh_key_fingerprint()
206
- + gpg-interface: fix leak of "line" in parse_ssh_output()
207
- (merged to 'next' on 2021-10-14 at 97735c6091)
208
- + ssh signing: clarify trustlevel usage in docs
209
- + ssh signing: fmt-merge-msg tests & config parse
210
- + Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix
211
- (this branch is used by fs/ssh-signing-key-lifetime; uses fs/ssh-signing.)
212
-
213
- Fix-up for the other topic already in 'next'.
214
-
215
-
216
-* jc/doc-commit-header-continuation-line (2021-10-12) 1 commit
217
- (merged to 'next' on 2021-10-18 at 99b71c0aaf)
218
- + signature-format.txt: explain and illustrate multi-line headers
219
-
220
- Doc update.
221
-
222
-
223
-* jh/perf-remove-test-times (2021-10-04) 1 commit
224
- (merged to 'next' on 2021-10-14 at 473a26166c)
225
- + t/perf/perf-lib.sh: remove test_times.* at the end test_perf_()
226
-
227
- Perf test fix.
228
-
229
-
230
-* js/userdiff-cpp (2021-10-25) 7 commits
231
- (merged to 'next' on 2021-10-25 at 2158813163)
232
- + userdiff-cpp: back out the digit-separators in numbers
233
- (merged to 'next' on 2021-10-18 at fea77f6c4e)
234
- + userdiff-cpp: learn the C++ spaceship operator
235
- + userdiff-cpp: permit the digit-separating single-quote in numbers
236
- + userdiff-cpp: prepare test cases with yet unsupported features
237
- + userdiff-cpp: tighten word regex
238
- + t4034: add tests showing problematic cpp tokenizations
239
- + t4034/cpp: actually test that operator tokens are not split
240
-
241
- Userdiff patterns for the C++ language has been updated.
242
-
243
-
244
-* jt/no-abuse-alternate-odb-for-submodules (2021-10-08) 9 commits
245
- (merged to 'next' on 2021-10-14 at ae49a2ceda)
246
- + submodule: trace adding submodule ODB as alternate
247
- + submodule: pass repo to check_has_commit()
248
- + object-file: only register submodule ODB if needed
249
- + merge-{ort,recursive}: remove add_submodule_odb()
250
- + refs: peeling non-the_repository iterators is BUG
251
- + refs: teach arbitrary repo support to iterators
252
- + refs: plumb repo into ref stores
253
- + Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
254
- + Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
255
-
256
- Follow through the work to use the repo interface to access
257
- submodule objects in-process, instead of abusing the alternate
258
- object database interface.
259
-
260
-
261
-* pw/sparse-cache-tree-verify-fix (2021-10-18) 2 commits
262
- (merged to 'next' on 2021-10-18 at 0186a643cc)
263
- + t1092: run "rebase --apply" without "-q" in testing
264
- (merged to 'next' on 2021-10-11 at 2f90c87850)
265
- + sparse index: fix use-after-free bug in cache_tree_verify()
266
-
267
- Recent sparse-index addition, namely any use of index_name_pos(),
268
- can expand sparse index entries and breaks any code that walks
269
- cache-tree or existing index entries. One such instance of such a
270
- breakage has been corrected.
271
-
272
-
273
-* rs/add-dry-run-without-objects (2021-10-12) 1 commit
274
- (merged to 'next' on 2021-10-14 at a42928e134)
275
- + add: don't write objects with --dry-run
276
-
277
- Stop "git add --dry-run" from creating new blob and tree objects.
278
-
279
-
280
-* rs/disable-gc-during-perf-tests (2021-10-11) 1 commit
281
- (merged to 'next' on 2021-10-14 at e0dd4b9bd4)
282
- + perf: disable automatic housekeeping
283
-
284
- Avoid performance measurements from getting ruined by gc and other
285
- housekeeping pauses interfering in the middle.
286
-
287
-
288
-* tb/fix-midx-rename-while-mapped (2021-10-15) 5 commits
289
- (merged to 'next' on 2021-10-18 at 52e552caae)
290
- + midx.c: guard against commit_lock_file() failures
291
- + midx.c: lookup MIDX by object directory during repack
292
- + midx.c: lookup MIDX by object directory during expire
293
- + midx.c: extract MIDX lookup by object_dir
294
- + Merge branch 'tb/repack-write-midx' into tb/fix-midx-rename-while-mapped
295
-
296
- The codepath to write a new version of .midx multi-pack index files
297
- has learned to release the mmaped memory holding the current
298
- version of .midx before removing them from the disk, as some
299
- platforms do not allow removal of a file that still has mapping.
300
-
301
---------------------------------------------------
302
-[New Topics]
303
-
304
-* ab/generate-command-list (2021-10-23) 10 commits
305
- - generate-cmdlist.sh: replace "cut", "tr" and "grep" with pure-shell
306
- - generate-cmdlist.sh: replace "grep' invocation with a shell version
307
- - generate-cmdlist.sh: do not shell out to "sed"
308
- - generate-cmdlist.sh: stop sorting category lines
309
- - generate-cmdlist.sh: replace for loop by printf's auto-repeat feature
310
- - generate-cmdlist.sh: run "grep | sort", not "sort | grep"
311
- - generate-cmdlist.sh: don't call get_categories() from category_list()
312
- - generate-cmdlist.sh: spawn fewer processes
313
- - generate-cmdlist.sh: trivial whitespace change
314
- - command-list.txt: sort with "LC_ALL=C sort"
315
-
316
- Build optimization.
317
-
318
-
319
-* ab/ref-filter-leakfix (2021-10-20) 3 commits
320
- (merged to 'next' on 2021-10-23 at 8066971a3d)
321
- + branch: use ref_sorting_release()
322
- + ref-filter API user: add and use a ref_sorting_release()
323
- + tag: use a "goto cleanup" pattern, leak less memory
324
- (this branch is used by jc/fix-ref-sorting-parse.)
325
-
326
- "git for-each-ref" family of commands were leaking the ref_sorting
327
- instances that hold sorting keys specified by the user; this has
328
- been corrected.
329
-
330
- Will merge to 'master'.
331
-
332
-
333
-* bs/doc-blame-color-lines (2021-10-20) 1 commit
334
- (merged to 'next' on 2021-10-23 at 4da10a5162)
335
- + git config doc: fix recent ASCIIDOC formatting regression
336
-
337
- Doc fix.
338
-
339
- Will merge to 'master'.
340
-
341
-
342
-* jc/fix-pull-ff-only-when-already-up-to-date (2021-10-20) 1 commit
343
- - pull: --ff-only should make it a noop when already-up-to-date
344
-
345
- "git pull --ff-only" and "git pull --rebase --ff-only" should make
346
- it a no-op to attempt pulling from a remote that is behind us, but
347
- instead the command errored out by saying it was impossible to
348
- fast-forward, which may technically be true, but not a useful thing
349
- to diagnose as an error. This has been corrected.
350
-
351
- Will merge to 'next'?
60
+ Hotfix for a topic recently merged to 'master'.
61
62
63
* ab/make-sparse-for-real (2021-10-21) 1 commit
@@ -357,8 +66,6 @@ Release tarballs are available at:
66
67
Fix-up for a recent topic.
68
360
- Will merge to 'master'.
361
-
69
70
* ab/plug-handle-path-exclude-leak (2021-10-21) 1 commit
71
(merged to 'next' on 2021-10-23 at 6be5d7bea8)
@@ -366,8 +73,6 @@ Release tarballs are available at:
73
74
Leakfix.
75
369
- Will merge to 'master'.
370
-
76
77
* ab/plug-random-leaks (2021-10-23) 6 commits
78
(merged to 'next' on 2021-10-23 at 9c04a95718)
@@ -380,18 +85,17 @@ Release tarballs are available at:
85
86
Leakfix.
87
383
- Will merge to 'master'.
384
-
88
386
-* ab/sh-retire-helper-functions (2021-10-21) 6 commits
387
- - git-sh-setup: remove "sane_grep", it's not needed anymore
388
- - git-sh-setup: remove unused sane_egrep() function
389
- - git-instaweb: unconditionally assume that gitweb is mod_perl capable
390
- - Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
391
- - Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
392
- - Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)
89
+* ab/ref-filter-leakfix (2021-10-20) 3 commits
90
+ (merged to 'next' on 2021-10-23 at 8066971a3d)
91
+ + branch: use ref_sorting_release()
92
+ + ref-filter API user: add and use a ref_sorting_release()
93
+ + tag: use a "goto cleanup" pattern, leak less memory
94
+ (this branch is used by jc/fix-ref-sorting-parse.)
95
394
- Make a few helper functions unused and then lose them.
96
+ "git for-each-ref" family of commands were leaking the ref_sorting
97
+ instances that hold sorting keys specified by the user; this has
98
+ been corrected.
99
100
101
* ab/sh-retire-rebase-preserve-merges (2021-10-21) 2 commits
@@ -401,33 +105,20 @@ Release tarballs are available at:
105
106
Code clean-up to remove unused helpers.
107
404
- Will merge to 'master'.
108
109
+* ab/test-bail (2021-10-14) 2 commits
110
+ (merged to 'next' on 2021-10-23 at 4a16ebdb74)
111
+ + test-lib.sh: use "Bail out!" syntax on bad SANITIZE=leak use
112
+ + test-lib.sh: de-duplicate error() teardown code
113
407
-* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits
408
- - status: print stash info with --porcelain=v2 --show-stash
409
- - status: count stash entries in separate function
114
+ A new feature has been added to abort early in the test framework.
115
411
- Allow "git status --porcelain=v2" to show the number of stash
412
- entries with --show-stash like the normal output does.
116
414
- Will merge to 'next'.
117
+* ab/unbundle-progress (2021-10-27) 1 commit
118
+ (merged to 'next' on 2021-10-27 at a6ec5e5fb5)
119
+ + git-bundle.txt: add missing words and punctuation
120
416
-
417
-* tb/plug-pack-bitmap-leaks (2021-10-21) 9 commits
418
- - pack-bitmap.c: more aggressively free in free_bitmap_index()
419
- - pack-bitmap.c: don't leak type-level bitmaps
420
- - pack-bitmap.c: avoid leaking via midx_bitmap_filename()
421
- - builtin/multi-pack-index.c: don't leak concatenated options
422
- - builtin/repack.c: avoid leaking child arguments
423
- - builtin/pack-objects.c: don't leak memory via arguments
424
- - t/helper/test-read-midx.c: free MIDX within read_midx_file()
425
- - midx.c: don't leak MIDX from verify_midx_file
426
- - midx.c: clean up chunkfile after reading the MIDX
427
-
428
- Leakfix.
429
-
430
- Will merge to 'next'?
121
+ Doc clarification.
122
123
124
* bs/archive-doc-compression-level (2021-10-25) 1 commit
@@ -437,61 +128,45 @@ Release tarballs are available at:
128
Update "git archive" documentation and give explicit mention on the
129
compression level for both zip and tar.gz format.
130
440
- Will merge to 'master'.
441
-
442
-
443
-* es/pretty-describe-more (2021-10-23) 3 commits
444
- - pretty: add abbrev option to %(describe)
445
- - pretty: add tag option to %(describe)
446
- - pretty.c: rename describe options variable to more descriptive name
447
-
448
- Extend "git log --format=%(describe)" placeholder to allow passing
449
- selected command-line options to the underlying "git describe"
450
- command.
131
452
- Expecting a reroll.
132
+* bs/doc-blame-color-lines (2021-10-20) 1 commit
133
+ (merged to 'next' on 2021-10-23 at 4da10a5162)
134
+ + git config doc: fix recent ASCIIDOC formatting regression
135
136
+ Doc fix.
137
455
-* fs/ssh-signing-key-lifetime (2021-10-23) 8 commits
456
- - ssh signing: fmt-merge-msg/check_signature with tag date
457
- - ssh signing: verify-tag/check_signature with tag date
458
- - ssh signing: git log/check_signature with commit date
459
- - ssh signing: verify-commit/check_signature with commit date
460
- - ssh signing: add key lifetime test prereqs
461
- - ssh signing: extend check_signature to accept payload metadata
462
- - Merge branch 'fs/ssh-signing-fix' into fs/ssh-signing-key-lifetime
463
- - Merge branch 'fs/ssh-signing' into fs/ssh-signing-key-lifetime
138
465
- Extend the signing of objects with SSH keys and learn to pay
466
- attention to the key validity time range when verifying.
139
+* cm/drop-xunsetenv (2021-10-29) 1 commit
140
+ (merged to 'next' on 2021-10-29 at 3004dd0e66)
141
+ + wrapper: remove xunsetenv()
142
468
- Expecting a reroll.
469
- cf. <51099904-a962-eb23-8baf-9ce15fff7d10@gigacodes.de>
143
+ Drop a helper function that has never been used since its addition.
144
145
146
* jc/branch-copy-doc (2021-10-23) 1 commit
473
- - branch (doc): -m/-c copies config and reflog
147
+ (merged to 'next' on 2021-10-27 at efc3d30457)
148
+ + branch (doc): -m/-c copies config and reflog
149
150
"git branch -c/-m new old" was not described to copy config, which
151
has been corrected.
152
478
- Will merge to 'next'?
479
-
153
481
-* jc/doc-format-patch-clarify-auto-base (2021-10-23) 1 commit
482
- - format-patch (doc): clarify --base=auto
483
-
484
- Rephrase the description of "format-patch --base=auto".
154
+* jk/http-push-status-fix (2021-10-18) 2 commits
155
+ (merged to 'next' on 2021-10-23 at 9704ff261d)
156
+ + transport-helper: recognize "expecting report" error from send-pack
157
+ + send-pack: complain about "expecting report" with --helper-status
158
486
- Will merge to 'next'?
159
+ "git push" client talking to an HTTP server did not diagnose the
160
+ lack of the final status report from the other side correctly,
161
+ which has been corrected.
162
163
489
-* jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits
490
- - (wip) reword the final review part
491
- - SubmittingPatchs: clarify choice of base and testing
164
+* jk/log-warn-on-bogus-encoding (2021-10-29) 2 commits
165
+ (merged to 'next' on 2021-10-29 at 7fa61a88f4)
166
+ + log: document --encoding behavior on iconv() failure
167
+ + Revert "logmsg_reencode(): warn when iconv() fails"
168
493
- Extend the guidance to choose the base commit to build your work
494
- on, and hint/nudge contributors to read others' changes.
169
+ Squelch over-eager warning message added during this cycle.
170
171
172
* js/expand-runtime-prefix (2021-10-25) 1 commit
@@ -500,19 +175,25 @@ Release tarballs are available at:
175
176
Typofix.
177
503
- Will merge to 'master'.
178
+
179
+* ks/submodule-add-message-fix (2021-10-27) 2 commits
180
+ (merged to 'next' on 2021-10-27 at 4fc7c47990)
181
+ + submodule: drop unused sm_name parameter from append_fetch_remotes()
182
+ (merged to 'next' on 2021-10-25 at 377e759528)
183
+ + submodule--helper: fix incorrect newlines in an error message
184
+
185
+ Message regression fix.
186
187
188
* ma/doc-folder-to-directory (2021-10-25) 3 commits
507
- - gitweb.txt: change "folder" to "directory"
508
- - gitignore.txt: change "folder" to "directory"
509
- - git-multi-pack-index.txt: change "folder" to "directory"
189
+ (merged to 'next' on 2021-10-27 at 99200092f7)
190
+ + gitweb.txt: change "folder" to "directory"
191
+ + gitignore.txt: change "folder" to "directory"
192
+ + git-multi-pack-index.txt: change "folder" to "directory"
193
194
Consistently use 'directory', not 'folder', to call the filesystem
195
entity that collects a group of files and, eh, directories.
196
514
- Will merge to 'next' and then to 'master'.
515
-
197
198
* ma/doc-git-version (2021-10-25) 1 commit
199
(merged to 'next' on 2021-10-25 at 9f74afec0c)
@@ -520,27 +201,138 @@ Release tarballs are available at:
201
202
Typofix.
203
523
- Will merge to 'master'.
204
205
+* mt/fix-add-rm-with-sparse-index (2021-10-28) 1 commit
206
+ (merged to 'next' on 2021-10-29 at 06f21a49b1)
207
+ + add, rm, mv: fix bug that prevents the update of non-sparse dirs
208
526
-* rd/http-backend-code-simplification (2021-10-25) 1 commit
527
- - http-backend: remove a duplicated code branch
209
+ Fix-up to a topic already merged to 'master'.
210
529
- (slight) Code simplification.
211
531
- Will merge to 'next'?
212
+* re/completion-fix-test-equality (2021-10-28) 1 commit
213
+ (merged to 'next' on 2021-10-29 at 78decd16a0)
214
+ + completion: fix incorrect bash/zsh string equality check
215
+
216
+ Fix long-standing shell syntax error in the completion script.
217
218
219
* sg/sparse-index-not-that-common-a-command (2021-10-25) 1 commit
535
- - command-list.txt: remove 'sparse-index' from main help
220
+ (merged to 'next' on 2021-10-27 at 020dc425a4)
221
+ + command-list.txt: remove 'sparse-index' from main help
222
223
Drop "git sparse-index" from the list of common commands.
224
225
+--------------------------------------------------
226
+[New Topics]
227
+
228
+* ar/fix-git-pull-no-verify (2021-10-28) 1 commit
229
+ - pull: honor --no-verify and do not call the commit-msg hook
230
+
231
+ "git pull --no-verify" did not affect the underlying "git merge".
232
+
233
+ Will merge to 'next'.
234
+
235
+
236
+* if/redact-packfile-uri (2021-10-29) 2 commits
237
+ - http-fetch: redact url on die() message
238
+ - fetch-pack: redact packfile urls in traces
239
+
240
+ Redact the path part of packfile URI that appears in the trace output.
241
+
242
+
243
+* ar/no-verify-doc (2021-10-29) 1 commit
244
+ - Document positive variant of commit and merge option "--no-verify"
245
+
246
+ Doc update.
247
+
248
+ Will merge to 'next'.
249
+
250
+
251
+* ew/test-wo-fsync (2021-10-29) 1 commit
252
+ - tests: disable fsync everywhere
253
+
254
+ Allow running our tests while disabling internal fsync.
255
+
256
+
257
+* ja/doc-cleanup (2021-10-28) 10 commits
258
+ - init doc: --shared=0xxx does not give umask but perm bits
259
+ - doc: git-init: clarify file modes in octal.
260
+ - doc: git-http-push: describe the refs as pattern pairs
261
+ - doc: uniformize <URL> placeholders' case
262
+ - doc: use three dots for indicating repetition instead of star
263
+ - doc: git-ls-files: express options as optional alternatives
264
+ - doc: use only hyphens as word separators in placeholders
265
+ - doc: express grammar placeholders between angle brackets
266
+ - doc: split placeholders as individual tokens
267
+ - doc: fix git credential synopsis
268
+
269
+ Doc update.
270
+
271
+ Will merge to 'next'.
272
+
273
+
274
+* re/color-default-reset (2021-10-28) 3 commits
275
+ - color: allow colors to be prefixed with "reset"
276
+ - color: support "default" to restore fg/bg color
277
+ - color: add missing GIT_COLOR_* white/black constants
278
+
279
+ "default" and "reset" colors have been added to our palette.
280
+
281
+
282
+* ab/test-lib (2021-10-29) 1 commit
283
+ (merged to 'next' on 2021-10-29 at b3d23601bd)
284
+ + t5310: drop lib-bundle.sh include
285
+
286
+ Test (cosmetic) fix.
287
+
288
+ Will merge to 'master'.
289
+
290
+
291
+* jc/fix-first-object-walk (2021-10-29) 2 commits
292
+ - docs: add headers in MyFirstObjectWalk
293
+ - docs: fix places that break compilation in MyFirstObjectWalk
294
+
295
+ Doc update.
296
+
297
+
298
+* jc/unsetenv-returns-an-int (2021-10-29) 1 commit
299
+ - unsetenv(3) returns int, not void
300
+
301
+ The compatibility implementation for unsetenv(3) were written to
302
+ mimic ancient, non-POSIX, variant seen in an old glibc; it has been
303
+ changed to return an integer to match the more modern era.
304
+
305
Will merge to 'next'.
306
307
+
308
+* mc/clean-smudge-with-llp64 (2021-10-29) 8 commits
309
+ - clean/smudge: allow clean filters to process extremely large files
310
+ - odb: guard against data loss checking out a huge file
311
+ - git-compat-util: introduce more size_t helpers
312
+ - odb: teach read_blob_entry to use size_t
313
+ - t1051: introduce a smudge filter test for extremely large files
314
+ - test-lib: add prerequisite for 64-bit platforms
315
+ - test-tool genzeros: generate large amounts of data more efficiently
316
+ - test-genzeros: allow more than 2G zeros in Windows
317
+
318
--------------------------------------------------
319
[Stalled]
320
321
+* mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit
322
+ - submodule: absorb git dir instead of dying on deinit
323
+
324
+ "git submodule deinit" for a submodule whose .git metadata
325
+ directory is embedded in its working tree refused to work, until
326
+ the submodule gets converted to use the "absorbed" form where the
327
+ metadata directory is stored in superproject, and a gitfile at the
328
+ top-level of the working tree of the submodule points at it. The
329
+ command is taught to convert such submodules to the absorbed form
330
+ as needed.
331
+
332
+ Expecting a reroll.
333
+ cf. <xmqqwnmopqqk.fsf@gitster.g>
334
+
335
+
336
* ar/submodule-update (2021-10-13) 9 commits
337
. submodule--helper: rename helper functions
338
. submodule--helper: remove unused helpers
@@ -558,8 +350,18 @@ Release tarballs are available at:
350
which is among the topics this topic stomps on.
351
352
561
-* pw/diff-color-moved-fix (2021-08-05) 13 commits
562
- - diff: drop unused options parameter from cmp_in_block_with_wsd()
353
+* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
354
+ - fetch: fix segfault on --set-upstream while on a detached HEAD
355
+
356
+ "git fetch --set-upstream" while on detached HEAD segfaulted
357
+ instead of noticing that such an operation did not make sense.
358
+
359
+ Getting tired of waiting for a reroll; will discard.
360
+
361
+--------------------------------------------------
362
+[Cooking]
363
+
364
+* pw/diff-color-moved-fix (2021-10-27) 15 commits
365
- diff --color-moved: intern strings
366
- diff: use designated initializers for emitted_diff_symbol
367
- diff --color-moved-ws=allow-indentation-change: improve hash lookups
@@ -571,43 +373,145 @@ Release tarballs are available at:
373
- diff: simplify allow-indentation-change delta calculation
374
- diff --color-moved: avoid false short line matches and bad zerba coloring
375
- diff --color-moved=zebra: fix alternate coloring
376
+ - diff --color-moved: rewind when discarding pmb
377
+ - diff --color-moved: factor out function
378
+ - diff --color-moved: clear all flags on blocks that are too short
379
- diff --color-moved: add perf tests
380
576
- Originally merged to 'next' on 2021-08-05
577
-
381
Long-overdue correctness and performance update to "diff
382
--color-moved" feature.
383
581
- Expecting a reroll.
582
- cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
384
385
+* ab/generate-command-list (2021-10-23) 10 commits
386
+ - generate-cmdlist.sh: replace "cut", "tr" and "grep" with pure-shell
387
+ - generate-cmdlist.sh: replace "grep' invocation with a shell version
388
+ - generate-cmdlist.sh: do not shell out to "sed"
389
+ - generate-cmdlist.sh: stop sorting category lines
390
+ - generate-cmdlist.sh: replace for loop by printf's auto-repeat feature
391
+ - generate-cmdlist.sh: run "grep | sort", not "sort | grep"
392
+ - generate-cmdlist.sh: don't call get_categories() from category_list()
393
+ - generate-cmdlist.sh: spawn fewer processes
394
+ - generate-cmdlist.sh: trivial whitespace change
395
+ - command-list.txt: sort with "LC_ALL=C sort"
396
585
-* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
586
- - fetch: fix segfault on --set-upstream while on a detached HEAD
397
+ Build optimization.
398
588
- "git fetch --set-upstream" while on detached HEAD segfaulted
589
- instead of noticing that such an operation did not make sense.
399
+ Getting there.
400
+ cf. <xmqqsfwr8j66.fsf@gitster.g>
401
591
- Expecting a reroll.
592
- cf. <xmqqsg0ri5mq.fsf@gitster.g>
402
594
---------------------------------------------------
595
-[Cooking]
403
+* jc/fix-pull-ff-only-when-already-up-to-date (2021-10-29) 1 commit
404
+ (merged to 'next' on 2021-10-29 at ad4753e668)
405
+ + pull: --ff-only should make it a noop when already-up-to-date
406
+
407
+ "git pull --ff-only" and "git pull --rebase --ff-only" should make
408
+ it a no-op to attempt pulling from a remote that is behind us, but
409
+ instead the command errored out by saying it was impossible to
410
+ fast-forward, which may technically be true, but not a useful thing
411
+ to diagnose as an error. This has been corrected.
412
+
413
+ Will cook in 'next'.
414
+
415
+
416
+* ab/sh-retire-helper-functions (2021-10-21) 6 commits
417
+ - git-sh-setup: remove "sane_grep", it's not needed anymore
418
+ - git-sh-setup: remove unused sane_egrep() function
419
+ - git-instaweb: unconditionally assume that gitweb is mod_perl capable
420
+ - Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
421
+ - Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
422
+ - Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)
423
+
424
+ Make a few helper functions unused and then lose them.
425
+
426
+
427
+* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits
428
+ (merged to 'next' on 2021-10-29 at 1a01b886e5)
429
+ + status: print stash info with --porcelain=v2 --show-stash
430
+ + status: count stash entries in separate function
431
+
432
+ Allow "git status --porcelain=v2" to show the number of stash
433
+ entries with --show-stash like the normal output does.
434
+
435
+ Will cook in 'next'.
436
+
437
+
438
+* tb/plug-pack-bitmap-leaks (2021-10-28) 9 commits
439
+ - pack-bitmap.c: more aggressively free in free_bitmap_index()
440
+ - pack-bitmap.c: don't leak type-level bitmaps
441
+ - midx.c: write MIDX filenames to strbuf
442
+ - builtin/multi-pack-index.c: don't leak concatenated options
443
+ - builtin/repack.c: avoid leaking child arguments
444
+ - builtin/pack-objects.c: don't leak memory via arguments
445
+ - t/helper/test-read-midx.c: free MIDX within read_midx_file()
446
+ - midx.c: don't leak MIDX from verify_midx_file
447
+ - midx.c: clean up chunkfile after reading the MIDX
448
+
449
+ Leakfix.
450
+
451
+ Will merge to 'next'?
452
+
453
+
454
+* es/pretty-describe-more (2021-10-29) 3 commits
455
+ - pretty: add abbrev option to %(describe)
456
+ - pretty: add tag option to %(describe)
457
+ - pretty.c: rework describe options parsing for better extensibility
458
+
459
+ Extend "git log --format=%(describe)" placeholder to allow passing
460
+ selected command-line options to the underlying "git describe"
461
+ command.
462
+
463
+
464
+* fs/ssh-signing-key-lifetime (2021-10-27) 8 commits
465
+ - ssh signing: make fmt-merge-msg consider key lifetime
466
+ - ssh signing: make verify-tag consider key lifetime
467
+ - ssh signing: make git log verify key lifetime
468
+ - ssh signing: make verify-commit consider key lifetime
469
+ - ssh signing: add key lifetime test prereqs
470
+ - ssh signing: use sigc struct to pass payload
471
+ - Merge branch 'fs/ssh-signing-fix' into fs/ssh-signing-key-lifetime
472
+ - Merge branch 'fs/ssh-signing' into fs/ssh-signing-key-lifetime
473
+
474
+ Extend the signing of objects with SSH keys and learn to pay
475
+ attention to the key validity time range when verifying.
476
+
477
+
478
+* jc/doc-format-patch-clarify-auto-base (2021-10-23) 1 commit
479
+ (merged to 'next' on 2021-10-27 at 32c227324a)
480
+ + format-patch (doc): clarify --base=auto
481
+
482
+ Rephrase the description of "format-patch --base=auto".
483
+
484
+ Will merge to 'master'.
485
+
486
597
-* gc/remote-with-fewer-static-global-variables (2021-10-20) 4 commits
487
+* jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits
488
+ - (wip) reword the final review part
489
+ - SubmittingPatchs: clarify choice of base and testing
490
+
491
+ Extend the guidance to choose the base commit to build your work
492
+ on, and hint/nudge contributors to read others' changes.
493
+
494
+
495
+* rd/http-backend-code-simplification (2021-10-25) 1 commit
496
+ - http-backend: remove a duplicated code branch
497
+
498
+ (slight) Code simplification.
499
+
500
+ Will merge to 'next'?
501
+
502
+
503
+* gc/remote-with-fewer-static-global-variables (2021-10-28) 6 commits
504
- remote: add struct repository parameter to external functions
505
+ - remote: die if branch is not found in repository
506
- remote: remove the_repository->remote_state from static methods
507
- remote: use remote_state parameter internally
508
- remote: move static variables into per-repository struct
509
+ - t5516: add test case for pushing remote refspecs
510
511
Code clean-up to eventually allow information on remotes defined
512
for an arbitrary repository to be read.
513
606
- Expecting a reroll.
607
-
608
- Breaks pushremote_get() and causes "git push" to segfault; there
609
- might be other similar breakages.
610
- cf. <xmqqtuhbo2tn.fsf@gitster.g>
514
+ Will merge to 'next'?
515
516
517
* jk/loosen-urlmatch (2021-10-12) 1 commit
@@ -617,17 +521,7 @@ Release tarballs are available at:
521
Treat "_" as any other URL-valid characters in an URL when matching
522
the per-URL configuration variable names.
523
620
- Will merge to 'master'.
621
-
622
-
623
-* ab/test-bail (2021-10-14) 2 commits
624
- (merged to 'next' on 2021-10-23 at 4a16ebdb74)
625
- + test-lib.sh: use "Bail out!" syntax on bad SANITIZE=leak use
626
- + test-lib.sh: de-duplicate error() teardown code
627
-
628
- A new feature has been added to abort early in the test framework.
629
-
630
- Will merge to 'master'.
524
+ Will cook in 'next'.
525
526
527
* ab/config-based-hooks-2 (2021-10-20) 14 commits
@@ -663,17 +557,19 @@ Release tarballs are available at:
557
Will merge to 'master'.
558
559
666
-* so/stash-staged (2021-10-18) 1 commit
560
+* so/stash-staged (2021-10-28) 2 commits
561
+ (merged to 'next' on 2021-10-29 at 50335e8eeb)
562
+ + stash: get rid of unused argument in stash_staged()
563
(merged to 'next' on 2021-10-25 at 68b88e35c4)
564
+ stash: implement '--staged' option for 'push' and 'save'
565
566
"git stash" learned the "--staged" option to stash away what has
567
been added to the index (and nothing else).
568
673
- Will merge to 'master'.
569
+ Will cook in 'next'.
570
571
676
-* vd/sparse-sparsity-fix-on-read (2021-10-21) 3 commits
572
+* vd/sparse-sparsity-fix-on-read (2021-10-27) 3 commits
573
- sparse-index: update do_read_index to ensure correct sparsity
574
- sparse-index: add ensure_correct_sparsity function
575
- test-read-cache.c: prepare_repo_settings after config init
@@ -682,39 +578,30 @@ Release tarballs are available at:
578
index.sparse configuration specified by the repository immediately
579
after the on-disk index file is read.
580
581
+ Will merge to 'next'?
582
+
583
584
* jc/fix-ref-sorting-parse (2021-10-20) 2 commits
687
- - for-each-ref: delay parsing of --sort=<atom> options
688
- - Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse
689
- (this branch uses ab/ref-filter-leakfix.)
585
+ (merged to 'next' on 2021-10-29 at e3ec6e8e77)
586
+ + for-each-ref: delay parsing of --sort=<atom> options
587
+ + Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse
588
589
Things like "git -c branch.sort=bogus branch new HEAD", i.e. the
590
operation modes of the "git branch" command that do not need the
591
sort key information, no longer errors out by seeing a bogus sort
592
key.
593
696
- Will merge to 'next'.
594
+ Will cook in 'next'.
595
596
597
* jc/tutorial-format-patch-base (2021-10-23) 1 commit
700
- - MyFirstContribution: teach to use "format-patch --base=auto"
598
+ (merged to 'next' on 2021-10-29 at 67ff1a5a77)
599
+ + MyFirstContribution: teach to use "format-patch --base=auto"
600
601
Teach and encourage first-time contributors to this project to
602
state the base commit when they submit their topic.
603
705
- Will merge to 'next'.
706
-
707
-
708
-* jk/http-push-status-fix (2021-10-18) 2 commits
709
- (merged to 'next' on 2021-10-23 at 9704ff261d)
710
- + transport-helper: recognize "expecting report" error from send-pack
711
- + send-pack: complain about "expecting report" with --helper-status
712
-
713
- "git push" client talking to an HTTP server did not diagnose the
714
- lack of the final status report from the other side correctly,
715
- which has been corrected.
716
-
717
- Will merge to 'master'.
604
+ Will cook in 'next'.
605
606
607
* js/branch-track-inherit (2021-10-18) 1 commit
@@ -728,19 +615,6 @@ Release tarballs are available at:
615
cf. <87a6j6tbsv.fsf@gmgdl.gmail.com>
616
617
731
-* rb/doc-commit-header-continuation-line (2021-10-11) 1 commit
732
- - signature-format.txt: add space to fix gpgsig continuation line
733
-
734
- Values in the header portion of commit object can be multi-lined
735
- by a single SP indentation of the second and subsequent lines, and
736
- this applies to an empty line as well. Update an example in the
737
- technical documentation to highlight it.
738
-
739
- Will discard.
740
-
741
- Superseded by the jc/doc-commit-header-continuation-line topic.
742
-
743
-
618
* jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits
619
- t7527: test status with untracked-cache and fsmonitor--daemon
620
- fsmonitor: force update index after large responses
@@ -775,7 +649,7 @@ Release tarballs are available at:
649
Built-in fsmonitor (part 2).
650
651
778
-* ld/sparse-diff-blame (2021-10-15) 3 commits
652
+* ld/sparse-diff-blame (2021-10-27) 3 commits
653
- blame: enable and test the sparse index
654
- diff: enable and test the sparse index
655
- Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
@@ -783,23 +657,11 @@ Release tarballs are available at:
657
658
Teach diff and blame to work well with sparse index.
659
786
-
787
-* mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit
788
- - submodule: absorb git dir instead of dying on deinit
789
-
790
- "git submodule deinit" for a submodule whose .git metadata
791
- directory is embedded in its working tree refused to work, until
792
- the submodule gets converted to use the "absorbed" form where the
793
- metadata directory is stored in superproject, and a gitfile at the
794
- top-level of the working tree of the submodule points at it. The
795
- command is taught to convert such submodules to the absorbed form
796
- as needed.
797
-
798
- Under review.
799
- cf. <xmqqwnmopqqk.fsf@gitster.g>
660
+ Expecting a reroll.
661
+ cf. <YXgpqJIS2OgOgS+k@nand.local>
662
663
802
-* ns/remerge-diff (2021-10-08) 8 commits
664
+* ns/remerge-diff (2021-10-27) 9 commits
665
- doc/diff-options: explain the new --remerge-diff option
666
- show, log: adapt Elijah Newren's changes to common tmp-objdir API
667
- show, log: provide a --remerge-diff capability
@@ -808,6 +670,7 @@ Release tarballs are available at:
670
- merge-ort: add ability to record conflict messages in a file
671
- merge-ort: mark a few more conflict messages as omittable
672
- Merge branch 'ns/tmp-objdir' into ns/remerge-diff
673
+ - Merge branch 'ns/tmp-objdir' into ns/remerge-diff
674
(this branch uses ns/tmp-objdir.)
675
676
A new presentation for two-parent merge "--remerge-diff" can be
@@ -820,7 +683,10 @@ Release tarballs are available at:
683
them to longer-term storage" infrastructure with another topic.
684
685
823
-* ns/tmp-objdir (2021-10-04) 2 commits
686
+* ns/tmp-objdir (2021-10-27) 4 commits
687
+ (merged to 'next' on 2021-10-27 at 001a18c0e1)
688
+ + fixup! tmp-objdir: new API for creating temporary writable databases
689
+ + fixup! tmp-objdir: new API for creating temporary writable databases
690
(merged to 'next' on 2021-10-23 at 358d376f61)
691
+ tmp-objdir: disable ref updates when replacing the primary odb
692
+ tmp-objdir: new API for creating temporary writable databases
@@ -829,10 +695,11 @@ Release tarballs are available at:
695
New interface into the tmp-objdir API to help in-core use of the
696
quarantine feature.
697
832
- Will merge to 'master'.
698
+ On hold.
699
+ cf. <xmqqo87auqda.fsf@gitster.g>
700
701
835
-* vd/sparse-reset (2021-10-11) 8 commits
702
+* vd/sparse-reset (2021-10-27) 8 commits
703
- unpack-trees: improve performance of next_cache_entry
704
- reset: make --mixed sparse-aware
705
- reset: make sparse-aware (except --mixed)
@@ -846,7 +713,7 @@ Release tarballs are available at:
713
Various operating modes of "git reset" have been made to work
714
better with the sparse index.
715
849
- Needs review.
716
+ Ready?
717
718
719
* gc/use-repo-settings (2021-10-15) 4 commits
@@ -899,16 +766,14 @@ Release tarballs are available at:
766
cf. <911ab2c1-8a11-d9d0-4b28-fc801112f6da@gmail.com>
767
768
902
-* tp/send-email-completion (2021-10-07) 3 commits
769
+* tp/send-email-completion (2021-10-28) 2 commits
770
- send-email docs: add format-patch options
771
- send-email: programmatically generate bash completions
905
- - send-email: terminate --git-completion-helper with LF
772
773
The command line complation for "git send-email" options have been
774
tweaked to make it easier to keep it in sync with the command itself.
775
910
- Expecting a reroll.
911
- cf. <87fst7lkjx.fsf@evledraar.gmail.com>
776
+ Will merge to 'next'?
777
778
779
* hm/paint-hits-in-log-grep (2021-10-15) 4 commits
@@ -924,16 +789,9 @@ Release tarballs are available at:
789
Will merge to 'master'.
790
791
927
-* ks/submodule-add-message-fix (2021-10-23) 1 commit
928
- (merged to 'next' on 2021-10-25 at 377e759528)
929
- + submodule--helper: fix incorrect newlines in an error message
930
-
931
- Message regression fix.
932
-
933
- Will merge to 'master'.
934
-
935
-
936
-* ns/batched-fsync (2021-10-08) 8 commits
792
+* ns/batched-fsync (2021-10-27) 9 commits
793
+ (merged to 'next' on 2021-10-27 at eb2a3afdd1)
794
+ + Merge branch 'ns/tmp-objdir' into ns/batched-fsync
795
(merged to 'next' on 2021-10-25 at e45c907d41)
796
+ core.fsyncobjectfiles: performance tests for add and stash
797
+ core.fsyncobjectfiles: tests for batch mode
@@ -948,7 +806,8 @@ Release tarballs are available at:
806
The "core.fsyncobjectfiles" configuration variable can now be set
807
to "batch" for improved performance.
808
951
- Will merge to 'master'.
809
+ On hold.
810
+ cf. <xmqqo87auqda.fsf@gitster.g>
811
812
813
* en/zdiff3 (2021-09-20) 2 commits
@@ -958,7 +817,7 @@ Release tarballs are available at:
817
"Zealous diff3" style of merge conflict presentation has been added.
818
819
961
-* js/scalar (2021-10-07) 15 commits
820
+* js/scalar (2021-10-27) 15 commits
821
- scalar: accept -C and -c options before the subcommand
822
- scalar: implement the `version` command
823
- scalar: implement the `delete` command
@@ -990,48 +849,48 @@ Release tarballs are available at:
849
850
851
* ab/refs-errno-cleanup (2021-10-16) 21 commits
993
- - refs API: post-migration API renaming [2/2]
994
- - refs API: post-migration API renaming [1/2]
995
- - refs API: don't expose "errno" in run_transaction_hook()
996
- - refs API: make expand_ref() & repo_dwim_log() not set errno
997
- - refs API: make resolve_ref_unsafe() not set errno
998
- - refs API: make refs_ref_exists() not set errno
999
- - refs API: make refs_resolve_refdup() not set errno
1000
- - refs tests: ignore ignore errno in test-ref-store helper
1001
- - refs API: ignore errno in worktree.c's find_shared_symref()
1002
- - refs API: ignore errno in worktree.c's add_head_info()
1003
- - refs API: make files_copy_or_rename_ref() et al not set errno
1004
- - refs API: make loose_fill_ref_dir() not set errno
1005
- - refs API: make resolve_gitlink_ref() not set errno
1006
- - refs API: remove refs_read_ref_full() wrapper
1007
- - refs/files: remove "name exist?" check in lock_ref_oid_basic()
1008
- - reflog tests: add --updateref tests
1009
- - refs API: make refs_rename_ref_available() static
1010
- - refs API: make parse_loose_ref_contents() not set errno
1011
- - refs API: make refs_read_raw_ref() not set errno
1012
- - refs API: add a version of refs_resolve_ref_unsafe() with "errno"
1013
- - branch tests: test for errno propagating on failing read
852
+ (merged to 'next' on 2021-10-29 at 3f57147176)
853
+ + refs API: post-migration API renaming [2/2]
854
+ + refs API: post-migration API renaming [1/2]
855
+ + refs API: don't expose "errno" in run_transaction_hook()
856
+ + refs API: make expand_ref() & repo_dwim_log() not set errno
857
+ + refs API: make resolve_ref_unsafe() not set errno
858
+ + refs API: make refs_ref_exists() not set errno
859
+ + refs API: make refs_resolve_refdup() not set errno
860
+ + refs tests: ignore ignore errno in test-ref-store helper
861
+ + refs API: ignore errno in worktree.c's find_shared_symref()
862
+ + refs API: ignore errno in worktree.c's add_head_info()
863
+ + refs API: make files_copy_or_rename_ref() et al not set errno
864
+ + refs API: make loose_fill_ref_dir() not set errno
865
+ + refs API: make resolve_gitlink_ref() not set errno
866
+ + refs API: remove refs_read_ref_full() wrapper
867
+ + refs/files: remove "name exist?" check in lock_ref_oid_basic()
868
+ + reflog tests: add --updateref tests
869
+ + refs API: make refs_rename_ref_available() static
870
+ + refs API: make parse_loose_ref_contents() not set errno
871
+ + refs API: make refs_read_raw_ref() not set errno
872
+ + refs API: add a version of refs_resolve_ref_unsafe() with "errno"
873
+ + branch tests: test for errno propagating on failing read
874
875
The "remainder" of hn/refs-errno-cleanup topic.
876
1017
- Will merge to 'next'.
877
+ Will cook in 'next'.
878
879
1020
-* ab/only-single-progress-at-once (2021-10-13) 10 commits
880
+* ab/only-single-progress-at-once (2021-10-27) 8 commits
881
- progress.c: add & assert a "global_progress" variable
882
- various *.c: use isatty(1|2), not isatty(STDIN_FILENO|STDERR_FILENO)
883
- pack-bitmap-write.c: don't return without stop_progress()
884
- progress.c: add temporary variable from progress struct
1025
- - progress.c: call progress_interval() from progress_test_force_update()
1026
- - progress.c: move signal handler functions lower
885
- progress.c tests: test some invalid usage
1028
- - progress.c tests: make start/stop verbs on stdin
886
+ - progress.c tests: make start/stop commands on stdin
887
- progress.c test helper: add missing braces
888
- leak tests: fix a memory leaks in "test-progress" helper
889
890
Further tweaks on progress API.
891
1034
- Need to pick up an updated version.
892
+ Correction of the course may be required?
893
+ cf. <211025.8635opi8om.gmgdl@evledraar.gmail.com>
894
cf. <cover-v4-0.8-00000000000-20211025T111915Z-avarab@gmail.com>
895
896
@@ -1074,3 +933,14 @@ Release tarballs are available at:
933
A new presentation for two-parent merge "--remerge-diff" can be
934
used to show the difference between mechanical (and possibly
935
conflicted) merge results and the recorded resolution.
936
+
937
+
938
+* rb/doc-commit-header-continuation-line (2021-10-11) 1 commit
939
+ . signature-format.txt: add space to fix gpgsig continuation line
940
+
941
+ Values in the header portion of commit object can be multi-lined
942
+ by a single SP indentation of the second and subsequent lines, and
943
+ this applies to an empty line as well. Update an example in the
944
+ technical documentation to highlight it.
945
+
946
+ Superseded by the jc/doc-commit-header-continuation-line topic.