What's cooking (2022/02 #05)
Junio C Hamano committed
Feb 17, 2022 at 16:48 UTC
299cab39b3780f1ac50b6fb00a98bff352067c62
1 file changed
+505
-381
whats-cooking.txt
+505
-381
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2022, #04; Tue, 15)
4
-X-master-at: b80121027d1247a0754b3cc46897fee75c050b44
5
-X-next-at: 7e23e61f3f2abdae506f09b247827f12a86031cf
3
+Subject: What's cooking in git.git (Feb 2022, #05; Thu, 17)
4
+X-master-at: e2ac9141e64e2cd3e690d1b5fc848949827c09b4
5
+X-next-at: 5d30c73bfbb79b338e9ebbb6ed42713ff8f22e23
6
7
-What's cooking in git.git (Feb 2022, #04; Tue, 15)
7
+What's cooking in git.git (Feb 2022, #05; Thu, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,8 +18,8 @@ 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
-Many new topics have sketchy or even empty topic description in the
22
-list below; help to fill them in is very much appreciated ;-)
21
+We are near the end of 4th week of a 12-week cycle, and the fourth
22
+and the fifth batches of topics are in the 'master' ('main') branch.
23
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
@@ -49,38 +49,391 @@ Release tarballs are available at:
49
50
https://www.kernel.org/pub/software/scm/git/
51
52
+--------------------------------------------------
53
+[Graduated to 'master']
54
+
55
+* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit
56
+ (merged to 'next' on 2022-02-08 at 9922938a6a)
57
+ + compat: auto-detect if zlib has uncompress2()
58
+
59
+ The build procedure has been taught to notice older version of zlib
60
+ and enable our replacement uncompress2() automatically.
61
+ source: <xmqqr18x3s5s.fsf@gitster.g>
62
+
63
+
64
+* ab/complete-show-all-commands (2022-02-02) 2 commits
65
+ (merged to 'next' on 2022-02-09 at be3b7cf4e4)
66
+ + completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
67
+ + completion tests: re-source git-completion.bash in a subshell
68
+
69
+ The command line completion script (in contrib/) learned to
70
+ complete all Git subcommands, including the ones that are normally
71
+ hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.
72
+ source: <cover-v2-0.2-00000000000-20220202T111228Z-avarab@gmail.com>
73
+
74
+
75
+* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit
76
+ (merged to 'next' on 2022-02-08 at 1a8001f83e)
77
+ + perl Git.pm: don't ignore signalled failure in _cmd_close()
78
+
79
+ Git.pm update.
80
+ source: <patch-1.1-86353c3b366-20220201T205218Z-avarab@gmail.com>
81
+
82
+
83
+* en/fetch-negotiation-default-fix (2022-02-02) 3 commits
84
+ (merged to 'next' on 2022-02-08 at 95a8a91e97)
85
+ + repo-settings: rename the traditional default fetch.negotiationAlgorithm
86
+ + repo-settings: fix error handling for unknown values
87
+ + repo-settings: fix checking for fetch.negotiationAlgorithm=default
88
+
89
+ Interaction between fetch.negotiationAlgorithm and
90
+ feature.experimental configuration variables has been corrected.
91
+ source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>
92
+
93
+
94
+* en/remerge-diff (2022-02-02) 11 commits
95
+ (merged to 'next' on 2022-02-08 at 68b9a8a38b)
96
+ + diff-merges: avoid history simplifications when diffing merges
97
+ + merge-ort: mark conflict/warning messages from inner merges as omittable
98
+ + show, log: include conflict/warning messages in --remerge-diff headers
99
+ + diff: add ability to insert additional headers for paths
100
+ + merge-ort: format messages slightly different for use in headers
101
+ + merge-ort: mark a few more conflict messages as omittable
102
+ + merge-ort: capture and print ll-merge warnings in our preferred fashion
103
+ + ll-merge: make callers responsible for showing warnings
104
+ + log: clean unneeded objects during `log --remerge-diff`
105
+ + show, log: provide a --remerge-diff capability
106
+ + Merge branch 'ns/tmp-objdir' into en/remerge-diff
107
+ (this branch is used by en/merge-tree.)
108
+
109
+ "git log --remerge-diff" shows the difference from mechanical merge
110
+ result and the result that is actually recorded in a merge commit.
111
+ source: <pull.1103.v5.git.1643769457.gitgitgadget@gmail.com>
112
+
113
+
114
+* hn/reftable-coverity-fixes (2022-01-20) 17 commits
115
+ (merged to 'next' on 2022-02-08 at 1baf327a66)
116
+ + reftable: add print functions to the record types
117
+ + reftable: make reftable_record a tagged union
118
+ + reftable: remove outdated file reftable.c
119
+ + reftable: implement record equality generically
120
+ + reftable: make reftable-record.h function signatures const correct
121
+ + reftable: handle null refnames in reftable_ref_record_equal
122
+ + reftable: drop stray printf in readwrite_test
123
+ + reftable: order unittests by complexity
124
+ + reftable: all xxx_free() functions accept NULL arguments
125
+ + reftable: fix resource warning
126
+ + reftable: ignore remove() return value in stack_test.c
127
+ + reftable: check reftable_stack_auto_compact() return value
128
+ + reftable: fix resource leak blocksource.c
129
+ + reftable: fix resource leak in block.c error path
130
+ + reftable: fix OOB stack write in print functions
131
+ + Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
132
+ + Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
133
+
134
+ Problems identified by Coverity in the reftable code have been
135
+ corrected.
136
+ source: <pull.1152.v6.git.git.1642691534.gitgitgadget@gmail.com>
137
+
138
+
139
+* hn/reftable-tests (2022-01-31) 3 commits
140
+ (merged to 'next' on 2022-02-09 at 5e22946a1f)
141
+ + t5312: prepare for reftable
142
+ + t1405: mark test that checks existence as REFFILES
143
+ + t1405: explictly delete reflogs for reftable
144
+
145
+ Prepare more test scripts for the introduction of reftable.
146
+ source: <pull.1209.git.git.1643651420.gitgitgadget@gmail.com>
147
+
148
+
149
+* js/diff-filter-negation-fix (2022-01-28) 3 commits
150
+ (merged to 'next' on 2022-02-08 at fe004a4c2c)
151
+ + diff-filter: be more careful when looking for negative bits
152
+ + diff.c: move the diff filter bits definitions up a bit
153
+ + docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
154
+
155
+ "git diff --diff-filter=aR" is now parsed correctly.
156
+ source: <f1f027ad61beb1bd0dee73acbffdee5c0f967e9a.1643371370.git.gitgitgadget@gmail.com>
157
+
158
+
159
+* js/no-more-legacy-stash (2022-01-27) 4 commits
160
+ (merged to 'next' on 2022-02-08 at 5cecfdbd58)
161
+ + stash: stop warning about the obsolete `stash.useBuiltin` config setting
162
+ + stash: remove documentation for `stash.useBuiltin`
163
+ + add: remove support for `git-legacy-stash`
164
+ + git-sh-setup: remove remnant bits referring to `git-legacy-stash`
165
+
166
+ Removal of unused code and doc.
167
+ source: <pull.1133.git.1643321031.gitgitgadget@gmail.com>
168
+
169
+
170
+* js/scalar-global-options (2022-01-28) 1 commit
171
+ (merged to 'next' on 2022-02-09 at 8af744524c)
172
+ + scalar: accept -C and -c options before the subcommand
173
+
174
+ Scalar update.
175
+ source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>
176
+
177
+
178
+* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits
179
+ (merged to 'next' on 2022-02-09 at 8665cb204a)
180
+ + patch-id: fix scan_hunk_header on diffs with 1 line of before/after
181
+ + patch-id: fix antipatterns in tests
182
+
183
+ Unlike "git apply", "git patch-id" did not handle patches with
184
+ hunks that has only 1 line in either preimage or postimage, which
185
+ has been corrected.
186
+ source: <20220202041945.10077-1-jerry@skydio.com>
187
+ source: <20220202042015.10115-1-jerry@skydio.com>
188
+
189
+
190
+* jz/rev-list-exclude-first-parent-only (2022-01-12) 1 commit
191
+ (merged to 'next' on 2022-02-09 at f26a82c66a)
192
+ + git-rev-list: add --exclude-first-parent-only flag
193
+
194
+ "git log" and friends learned an option --exclude-first-parent-only
195
+ to propagate UNINTERESTING bit down only along the first-parent
196
+ chain, just like --first-parent option shows commits that lack the
197
+ UNINTERESTING bit only along the first-parent chain.
198
+ source: <20220111213941.30129-1-jerry@skydio.com>
199
+
200
+
201
+* ld/sparse-index-bash-completion (2022-02-08) 3 commits
202
+ (merged to 'next' on 2022-02-08 at ac1e968ab8)
203
+ + completion: handle unusual characters for sparse-checkout
204
+ + completion: improve sparse-checkout cone mode directory completion
205
+ + completion: address sparse-checkout issues
206
+
207
+ The command line completion (in contrib/) learns to complete
208
+ arguments to give to "git sparse-checkout" command.
209
+ source: <pull.1108.v7.git.1644255105.gitgitgadget@gmail.com>
210
+
211
+
212
+* ll/doc-mktree-typofix (2022-02-02) 1 commit
213
+ (merged to 'next' on 2022-02-08 at fe98063f1a)
214
+ + fix typo in git-mktree.txt
215
+
216
+ Typofix.
217
+ source: <pull.1207.git.git.1643792450866.gitgitgadget@gmail.com>
218
+
219
+
220
+* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit
221
+ (merged to 'next' on 2022-02-09 at 47631df376)
222
+ + doc: check-ignore: code-quote an exclamation mark
223
+
224
+ Typofix.
225
+ source: <20220203101643.1987-1-philipoakley@iee.email>
226
+
227
+
228
+* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits
229
+ (merged to 'next' on 2022-02-09 at 8b7ecb4e99)
230
+ + t/lib-read-tree-m-3way: indent with tabs
231
+ + t/lib-read-tree-m-3way: modernize style
232
+
233
+ Style updates on a test script helper.
234
+ source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
235
+
236
+
237
+* tb/midx-bitmap-corruption-fix (2022-01-27) 9 commits
238
+ (merged to 'next' on 2022-02-08 at a8cc333d78)
239
+ + pack-bitmap.c: gracefully fallback after opening pack/MIDX
240
+ + midx: read `RIDX` chunk when present
241
+ + t/lib-bitmap.sh: parameterize tests over reverse index source
242
+ + t5326: move tests to t/lib-bitmap.sh
243
+ + t5326: extract `test_rev_exists`
244
+ + t5326: drop unnecessary setup
245
+ + pack-revindex.c: instrument loading on-disk reverse index
246
+ + midx.c: make changing the preferred pack safe
247
+ + t5326: demonstrate bitmap corruption after permutation
248
+
249
+ A bug that made multi-pack bitmap and the object order out-of-sync,
250
+ making the .midx data corrupt, has been fixed.
251
+ source: <cover.1643150456.git.me@ttaylorr.com>
252
+
253
+
254
+* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit
255
+ (merged to 'next' on 2022-02-09 at 849450010e)
256
+ + subtree: force merge commit
257
+
258
+ When "git subtree" wants to create a merge, it used "git merge" and
259
+ let it be affected by end-user's "merge.ff" configuration, which
260
+ has been corrected.
261
+ source: <20220201172601.262718-1-aclopte@gmail.com>
262
+
263
+
264
+* vd/sparse-clean-etc (2022-01-13) 9 commits
265
+ (merged to 'next' on 2022-02-09 at 5928dbd25e)
266
+ + update-index: reduce scope of index expansion in do_reupdate
267
+ + update-index: integrate with sparse index
268
+ + update-index: add tests for sparse-checkout compatibility
269
+ + checkout-index: integrate with sparse index
270
+ + checkout-index: add --ignore-skip-worktree-bits option
271
+ + checkout-index: expand sparse checkout compatibility tests
272
+ + clean: integrate with sparse index
273
+ + reset: reorder wildcard pathspec conditions
274
+ + reset: fix validation in sparse index test
275
+ (this branch is used by en/present-despite-skipped.)
276
+
277
+ "git update-index", "git checkout-index", and "git clean" are
278
+ taught to work better with the sparse checkout feature.
279
+ source: <pull.1109.v2.git.1641924306.gitgitgadget@gmail.com>
280
+
281
--------------------------------------------------
282
[New Topics]
283
55
-* ds/mailmap (2022-02-14) 1 commit
56
- (merged to 'next' on 2022-02-14 at 1e50634951)
57
- + mailmap: change primary address for Derrick Stolee
284
+* en/sparse-checkout-fixes (2022-02-17) 5 commits
285
+ - sparse-checkout: reject arguments in cone-mode that look like patterns
286
+ - sparse-checkout: error or warn when given individual files
287
+ - sparse-checkout: pay attention to prefix for {set, add}
288
+ - sparse-checkout: correctly set non-cone mode when expected
289
+ - sparse-checkout: correct reapply's handling of options
290
59
- Update mailmap entries.
291
+ Further polishing of "git sparse-checkout".
292
+
293
+ Will merge to 'next'?
294
+ source: <pull.1118.v4.git.1645080889.gitgitgadget@gmail.com>
295
+
296
+
297
+* jc/name-rev-stdin (2022-02-15) 1 commit
298
+ (merged to 'next' on 2022-02-16 at ee993590a4)
299
+ + name-rev: replace --stdin with --annotate-stdin in synopsis
300
+
301
+ Finishing touches to an earlier "name-rev --annotate-stdin" series.
302
303
Will merge to 'master'.
62
- source: <pull.1142.git.1644857153590.gitgitgadget@gmail.com>
304
+ source: <pull.1216.git.git.1644958327302.gitgitgadget@gmail.com>
305
306
65
-* bc/clarify-eol-attr (2022-02-14) 1 commit
66
- (merged to 'next' on 2022-02-14 at 7e23e61f3f)
67
- + doc: clarify interaction between 'eol' and text=auto
307
+* ab/commit-plug-leaks (2022-02-16) 2 commits
308
+ - commit: use strbuf_release() instead of UNLEAK()
309
+ - commit: fix "author_ident" leak
310
69
- Documentation update
311
+ Leakfixes in the top-level called-once function.
312
+
313
+ Expecting a reroll.
314
+ I think UNLEAK->strbuf_release() is a regression.
315
+ source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
316
+
317
+
318
+* ab/diff-free-more (2022-02-16) 2 commits
319
+ (merged to 'next' on 2022-02-17 at be8ae78a2d)
320
+ + diff.[ch]: have diff_free() free options->parseopts
321
+ + diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)
322
+
323
+ Leakfixes.
324
325
Will merge to 'master'.
72
- source: <xmqqilth2u28.fsf@gitster.g>
326
+ source: <cover-0.2-00000000000-20220216T105250Z-avarab@gmail.com>
327
328
75
-* ab/date-mode-release (2022-02-14) 5 commits
76
- - date API: add and use a date_mode_release()
77
- - date API: add basic API docs
78
- - date API: provide and use a DATE_MODE_INIT
79
- - date API: create a date.h, split from cache.h
80
- - cache.h: remove always unused show_date_human() declaration
329
+* pw/single-key-interactive (2022-02-16) 3 commits
330
+ - add -p: disable stdin buffering when interactive.singlekey is set
331
+ - terminal: set VMIN and VTIME in non-canonical mode
332
+ - terminal: pop signal handler when terminal is restored
333
+
334
+ The single-key interactive operation used by "git add -p" has been
335
+ made more robust.
336
+
337
+ Will merge to 'next'?
338
+ source: <pull.1146.git.1645008873.gitgitgadget@gmail.com>
339
+
340
+
341
+* jh/builtin-fsmonitor-part3 (2022-02-16) 25 commits
342
+ - t/perf/p7527: add perf test for builtin FSMonitor
343
+ - t7527: FSMonitor tests for directory moves
344
+ - fsmonitor: optimize processing of directory events
345
+ - fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
346
+ - fsm-health-win32: force shutdown daemon if worktree root moves
347
+ - fsm-health-win32: add framework to monitor daemon health
348
+ - fsmonitor--daemon: stub in health thread
349
+ - fsmonitor--daemon: rename listener thread related variables
350
+ - fsmonitor--daemon: prepare for adding health thread
351
+ - fsmonitor--daemon: cd out of worktree root
352
+ - fsmonitor--daemon: print start message only if fsmonitor.announceStartup
353
+ - fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
354
+ - unpack-trees: initialize fsmonitor_has_run_once in o->result
355
+ - fsmonitor-settings: remote repos on Windows are incompatible with FSMonitor
356
+ - fsmonitor-settings: remote repos on macOS are incompatible with FSMonitor
357
+ - fsmonitor-settings: stub in macOS-specific incompatibility checking
358
+ - fsmonitor-settings: virtual repos are incompatible with FSMonitor
359
+ - fsmonitor-settings: stub in platform-specific incompatibility checking
360
+ - fsmonitor-settings: bare repos are incompatible with FSMonitor
361
+ - t/helper/fsmonitor-client: create stress test
362
+ - t7527: test builtin FSMonitor watching repos with unicode paths
363
+ - t7527: test FS event reporing on macOS WRT case and Unicode
364
+ - fsm-listen-win32: handle shortnames
365
+ - p7519: leave 1_file directory empty
366
+ - Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
367
+ (this branch uses jh/builtin-fsmonitor-part2.)
368
+
369
+ More fsmonitor--daemon.
370
+ source: <pull.1143.git.1644940773.gitgitgadget@gmail.com>
371
+
372
+
373
+* ds/core-untraced-cache-config (2022-02-17) 1 commit
374
+ - dir: force untracked cache with core.untrackedCache
375
+
376
+ Setting core.untrackedCache to true failed to add the untracked
377
+ cache extension to the index.
378
+
379
+ Will merge to 'next'.
380
+ source: <pull.1058.v2.git.1645131630140.gitgitgadget@gmail.com>
381
+
382
+
383
+* en/ort-inner-merge-conflict-report (2022-02-17) 1 commit
384
+ - merge-ort: make informational messages from recursive merges clearer
385
+
386
+ Messages "ort" merge backend prepares while dealing with conflicted
387
+ paths were unnecessarily confusing since it did not differentiate
388
+ inner merges and outer merges.
389
+
390
+ Will merge to 'next'.
391
+ source: <pull.1121.git.1645079923090.gitgitgadget@gmail.com>
392
+
393
+
394
+* hn/reftable-no-empty-keys (2022-02-17) 7 commits
395
+ - reftable: rename writer_stats to reftable_writer_stats
396
+ - reftable: add test for length of disambiguating prefix
397
+ - reftable: ensure that obj_id_len is >= 2 on writing
398
+ - reftable: avoid writing empty keys at the block layer
399
+ - reftable: add a test that verifies that writing empty keys fails
400
+ - reftable: reject 0 object_id_len
401
+ - Documentation: object_id_len goes up to 31
402
+
403
+ General clean-up in reftable implementation, including
404
+ clarification of the API documentation, tightening the code to
405
+ honor documented length limit, etc.
406
+
407
+ Will merge to 'next'?
408
+ source: <pull.1185.v2.git.git.1645106124.gitgitgadget@gmail.com>
409
+
410
+
411
+* ps/fetch-atomic (2022-02-17) 7 commits
412
+ - fetch: make `--atomic` flag cover pruning of refs
413
+ - fetch: make `--atomic` flag cover backfilling of tags
414
+ - refs: add interface to iterate over queued transactional updates
415
+ - fetch: report errors when backfilling tags fails
416
+ - fetch: control lifecycle of FETCH_HEAD in a single place
417
+ - fetch: backfill tags before setting upstream
418
+ - fetch: increase test coverage of fetches
419
+
420
+ "git fetch" can make two separate fetches, but ref updates coming
421
+ from them were in two separate ref transactions under "--atomic",
422
+ which has been corrected.
423
+
424
+ Will merge to 'next'.
425
+ source: <cover.1645102965.git.ps@pks.im>
426
82
- Plug (some) memory leaks around parse_date_format().
83
- source: <cover-v2-0.5-00000000000-20220204T235143Z-avarab@gmail.com>
427
+
428
+* rs/pcre-invalid-utf8-fix-fix (2022-02-17) 1 commit
429
+ - grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround
430
+
431
+ Workaround we have for versions of PCRE2 before their version 10.36
432
+ were in effect only for their versions newer than 10.36 by mistake,
433
+ which has been corrected.
434
+
435
+ Will merge to 'next'.
436
+ source: <4e391e2e-6561-3c2e-0306-c860a37356bc@web.de>
437
438
--------------------------------------------------
439
[Stalled]
@@ -117,6 +470,40 @@ Release tarballs are available at:
470
--------------------------------------------------
471
[Cooking]
472
473
+* ds/mailmap (2022-02-14) 1 commit
474
+ (merged to 'next' on 2022-02-14 at 1e50634951)
475
+ + mailmap: change primary address for Derrick Stolee
476
+
477
+ Update mailmap entries.
478
+
479
+ Will merge to 'master'.
480
+ source: <pull.1142.git.1644857153590.gitgitgadget@gmail.com>
481
+
482
+
483
+* bc/clarify-eol-attr (2022-02-14) 1 commit
484
+ (merged to 'next' on 2022-02-14 at 7e23e61f3f)
485
+ + doc: clarify interaction between 'eol' and text=auto
486
+
487
+ Documentation update
488
+
489
+ Will merge to 'master'.
490
+ source: <xmqqilth2u28.fsf@gitster.g>
491
+
492
+
493
+* ab/date-mode-release (2022-02-16) 5 commits
494
+ (merged to 'next' on 2022-02-17 at 62f1cf68ae)
495
+ + date API: add and use a date_mode_release()
496
+ + date API: add basic API docs
497
+ + date API: provide and use a DATE_MODE_INIT
498
+ + date API: create a date.h, split from cache.h
499
+ + cache.h: remove always unused show_date_human() declaration
500
+
501
+ Plug (some) memory leaks around parse_date_format().
502
+
503
+ Will merge to 'master'.
504
+ source: <cover-v3-0.5-00000000000-20220216T081203Z-avarab@gmail.com>
505
+
506
+
507
* jc/glossary-worktree (2022-02-09) 1 commit
508
(merged to 'next' on 2022-02-10 at d05e2b6ea3)
509
+ glossary: describe "worktree"
@@ -160,14 +547,15 @@ Release tarballs are available at:
547
source: <cover.1644495978.git.ps@pks.im>
548
549
163
-* pw/xdiff-alloc-fail (2022-02-09) 3 commits
550
+* pw/xdiff-alloc-fail (2022-02-16) 4 commits
551
- xdiff: handle allocation failure when merging
552
- xdiff: refactor a function
553
- xdiff: handle allocation failure in patience diff
554
+ - xdiff: fix a memory leak
555
168
- Expecting a reroll.
169
- cf. <9c5b3acb-aabc-3a0d-f4e7-e10cec410dbe@gmail.com>
170
- source: <pull.1140.git.1644404356.gitgitgadget@gmail.com>
556
+ Improve failure case behaviour of xdiff library when memory
557
+ allocation fails.
558
+ source: <pull.1140.v2.git.1645006510.gitgitgadget@gmail.com>
559
560
561
* sy/t0001-use-path-is-helper (2022-02-11) 1 commit
@@ -303,7 +691,7 @@ Release tarballs are available at:
691
source: <abc67d757cb6b244cf54b7b030985180ce134724.1644434802.git.me@ttaylorr.com>
692
693
306
-* jc/cat-file-batch-commands (2022-02-14) 4 commits
694
+* jc/cat-file-batch-commands (2022-02-16) 4 commits
695
- cat-file: add --batch-command mode
696
- cat-file: add remove_timestamp helper
697
- cat-file: introduce batch_mode enum to replace print_contents
@@ -312,7 +700,9 @@ Release tarballs are available at:
700
"git cat-file" learns "--batch-command" mode, which is a more
701
flexible interface than the existing "--batch" or "--batch-check"
702
modes, to allow different kinds of inquiries made.
315
- source: <pull.1212.v6.git.git.1644862988.gitgitgadget@gmail.com>
703
+
704
+ Will merge to 'next'?
705
+ source: <pull.1212.v9.git.git.1645045157.gitgitgadget@gmail.com>
706
707
708
* ar/submodule-update (2022-02-10) 20 commits
@@ -335,86 +725,38 @@ Release tarballs are available at:
725
. submodule--helper: run update using child process struct
726
. submodule--helper: allow setting superprefix for init_submodule()
727
. submodule--helper: refactor get_submodule_displaypath()
338
- . submodule--helper: get remote names from any repository
339
-
340
- Rewrite of "git submodule update" in C.
341
-
342
- Does not seem to play well with other topics in flight, with heavy conflicts.
343
- cf. <xmqqv8xj71mt.fsf@gitster.g>
344
- source: <20220210092833.55360-1-chooglen@google.com>
345
-
346
-
347
-* pw/use-in-process-checkout-in-rebase (2022-01-26) 14 commits
348
- (merged to 'next' on 2022-02-10 at bd7c3615fe)
349
- + rebase -m: don't fork git checkout
350
- + rebase --apply: set ORIG_HEAD correctly
351
- + rebase --apply: fix reflog
352
- + reset_head(): take struct rebase_head_opts
353
- + rebase: cleanup reset_head() calls
354
- + create_autostash(): remove unneeded parameter
355
- + reset_head(): make default_reflog_action optional
356
- + reset_head(): factor out ref updates
357
- + reset_head(): remove action parameter
358
- + rebase --apply: don't run post-checkout hook if there is an error
359
- + rebase: do not remove untracked files on checkout
360
- + rebase: pass correct arguments to post-checkout hook
361
- + t5403: refactor rebase post-checkout hook tests
362
- + rebase: factor out checkout for up to date branch
363
-
364
- Use an internal call to reset_head() helper function instead of
365
- spawning "git checkout" in "rebase", and update code paths that are
366
- involved in the change.
367
-
368
- Will merge to 'master'.
369
- source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
370
-
371
-
372
-* en/fetch-negotiation-default-fix (2022-02-02) 3 commits
373
- (merged to 'next' on 2022-02-08 at 95a8a91e97)
374
- + repo-settings: rename the traditional default fetch.negotiationAlgorithm
375
- + repo-settings: fix error handling for unknown values
376
- + repo-settings: fix checking for fetch.negotiationAlgorithm=default
377
-
378
- Fix interaction between fetch.negotiationAlgorithm and
379
- feature.experimental configuration variables.
380
-
381
- Will merge to 'master'.
382
- source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>
383
-
384
-
385
-* js/diff-filter-negation-fix (2022-01-28) 3 commits
386
- (merged to 'next' on 2022-02-08 at fe004a4c2c)
387
- + diff-filter: be more careful when looking for negative bits
388
- + diff.c: move the diff filter bits definitions up a bit
389
- + docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
390
-
391
- "git diff --diff-filter=aR" is now parsed correctly.
392
-
393
- Will merge to 'master'.
394
- source: <f1f027ad61beb1bd0dee73acbffdee5c0f967e9a.1643371370.git.gitgitgadget@gmail.com>
395
-
396
-
397
-* js/no-more-legacy-stash (2022-01-27) 4 commits
398
- (merged to 'next' on 2022-02-08 at 5cecfdbd58)
399
- + stash: stop warning about the obsolete `stash.useBuiltin` config setting
400
- + stash: remove documentation for `stash.useBuiltin`
401
- + add: remove support for `git-legacy-stash`
402
- + git-sh-setup: remove remnant bits referring to `git-legacy-stash`
728
+ . submodule--helper: get remote names from any repository
729
404
- Removal of unused code and doc.
730
+ Rewrite of "git submodule update" in C.
731
406
- Will merge to 'master'.
407
- source: <pull.1133.git.1643321031.gitgitgadget@gmail.com>
732
+ Does not seem to play well with other topics in flight, with heavy conflicts.
733
+ cf. <xmqqv8xj71mt.fsf@gitster.g>
734
+ source: <20220210092833.55360-1-chooglen@google.com>
735
736
410
-* js/scalar-global-options (2022-01-28) 1 commit
411
- (merged to 'next' on 2022-02-09 at 8af744524c)
412
- + scalar: accept -C and -c options before the subcommand
737
+* pw/use-in-process-checkout-in-rebase (2022-01-26) 14 commits
738
+ (merged to 'next' on 2022-02-10 at bd7c3615fe)
739
+ + rebase -m: don't fork git checkout
740
+ + rebase --apply: set ORIG_HEAD correctly
741
+ + rebase --apply: fix reflog
742
+ + reset_head(): take struct rebase_head_opts
743
+ + rebase: cleanup reset_head() calls
744
+ + create_autostash(): remove unneeded parameter
745
+ + reset_head(): make default_reflog_action optional
746
+ + reset_head(): factor out ref updates
747
+ + reset_head(): remove action parameter
748
+ + rebase --apply: don't run post-checkout hook if there is an error
749
+ + rebase: do not remove untracked files on checkout
750
+ + rebase: pass correct arguments to post-checkout hook
751
+ + t5403: refactor rebase post-checkout hook tests
752
+ + rebase: factor out checkout for up to date branch
753
414
- Scalar update.
754
+ Use an internal call to reset_head() helper function instead of
755
+ spawning "git checkout" in "rebase", and update code paths that are
756
+ involved in the change.
757
758
Will merge to 'master'.
417
- source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>
759
+ source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
760
761
762
* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
@@ -430,30 +772,6 @@ Release tarballs are available at:
772
source: <20220128194811.3396281-1-robin.jarry@6wind.com>
773
774
433
-* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits
434
- (merged to 'next' on 2022-02-09 at 8665cb204a)
435
- + patch-id: fix scan_hunk_header on diffs with 1 line of before/after
436
- + patch-id: fix antipatterns in tests
437
-
438
- Unlike "git apply", "git patch-id" did not handle patches with
439
- hunks that has only 1 line in either preimage or postimage, which
440
- has been corrected.
441
-
442
- Will merge to 'master'.
443
- source: <20220202041945.10077-1-jerry@skydio.com>
444
- source: <20220202042015.10115-1-jerry@skydio.com>
445
-
446
-
447
-* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit
448
- (merged to 'next' on 2022-02-08 at 1a8001f83e)
449
- + perl Git.pm: don't ignore signalled failure in _cmd_close()
450
-
451
- Git.pm update.
452
-
453
- Will merge to 'master'.
454
- source: <patch-1.1-86353c3b366-20220201T205218Z-avarab@gmail.com>
455
-
456
-
775
* ab/object-file-api-updates (2022-02-04) 11 commits
776
- object-file API: pass an enum to read_object_with_reference()
777
- object-file.c: add a literal version of write_object_file_prepare()
@@ -485,53 +803,17 @@ Release tarballs are available at:
803
source: <20220129063538.24038-1-bojun.cbj@gmail.com>
804
805
488
-* hn/reftable-tests (2022-01-31) 3 commits
489
- (merged to 'next' on 2022-02-09 at 5e22946a1f)
490
- + t5312: prepare for reftable
491
- + t1405: mark test that checks existence as REFFILES
492
- + t1405: explictly delete reflogs for reftable
493
-
494
- Prepare more test scripts for the introduction of reftable.
495
-
496
- Will merge to 'master'.
497
- source: <pull.1209.git.git.1643651420.gitgitgadget@gmail.com>
498
-
499
-
806
* ja/i18n-common-messages (2022-02-04) 4 commits
501
- - i18n: fix some misformated placeholders in command synopsis
502
- - i18n: remove from i18n strings that do not hold translatable parts
503
- - i18n: factorize "invalid value" messages
504
- - i18n: factorize more 'incompatible options' messages
807
+ (merged to 'next' on 2022-02-15 at 23d56641fc)
808
+ + i18n: fix some misformated placeholders in command synopsis
809
+ + i18n: remove from i18n strings that do not hold translatable parts
810
+ + i18n: factorize "invalid value" messages
811
+ + i18n: factorize more 'incompatible options' messages
812
813
Unify more messages to help l10n.
814
508
- Will merge to 'next'?
509
- source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>
510
-
511
-
512
-* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit
513
- (merged to 'next' on 2022-02-09 at 849450010e)
514
- + subtree: force merge commit
515
-
516
- When "git subtree" wants to create a merge, it used "git merge" and
517
- let it be affected by end-user's "merge.ff" configuration, which
518
- has been corrected.
519
-
520
- Will merge to 'master'.
521
- source: <20220201172601.262718-1-aclopte@gmail.com>
522
-
523
-
524
-* ab/complete-show-all-commands (2022-02-02) 2 commits
525
- (merged to 'next' on 2022-02-09 at be3b7cf4e4)
526
- + completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
527
- + completion tests: re-source git-completion.bash in a subshell
528
-
529
- The command line completion script (in contrib/) learns an option
530
- to complete all Git subcommands, including the ones that are
531
- normally hidden.
532
-
815
Will merge to 'master'.
534
- source: <cover-v2-0.2-00000000000-20220202T111228Z-avarab@gmail.com>
816
+ source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>
817
818
819
* en/merge-tree (2022-02-14) 13 commits
@@ -548,7 +830,6 @@ Release tarballs are available at:
830
- merge-tree: move logic for existing merge into new function
831
- merge-tree: rename merge_trees() to trivial_merge_trees()
832
- Merge branch 'en/remerge-diff' into en/merge-trees
551
- (this branch uses en/remerge-diff.)
833
834
A new command is introduced that takes two commits and computes a
835
tree that would be contained in the resulting merge commit, if the
@@ -557,56 +838,15 @@ Release tarballs are available at:
838
source: <pull.1122.v4.git.1644698093.gitgitgadget@gmail.com>
839
840
560
-* ll/doc-mktree-typofix (2022-02-02) 1 commit
561
- (merged to 'next' on 2022-02-08 at fe98063f1a)
562
- + fix typo in git-mktree.txt
563
-
564
- Typofix.
565
-
566
- Will merge to 'master'.
567
- source: <pull.1207.git.git.1643792450866.gitgitgadget@gmail.com>
568
-
569
-
570
-* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit
571
- (merged to 'next' on 2022-02-09 at 47631df376)
572
- + doc: check-ignore: code-quote an exclamation mark
573
-
574
- Typofix.
575
-
576
- Will merge to 'master'.
577
- source: <20220203101643.1987-1-philipoakley@iee.email>
578
-
579
-
580
-* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits
581
- (merged to 'next' on 2022-02-09 at 8b7ecb4e99)
582
- + t/lib-read-tree-m-3way: indent with tabs
583
- + t/lib-read-tree-m-3way: modernize style
584
-
585
- Style updates on a test script helper.
586
-
587
- Will merge to 'master'.
588
- source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
589
-
590
-
591
-* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit
592
- (merged to 'next' on 2022-02-08 at 9922938a6a)
593
- + compat: auto-detect if zlib has uncompress2()
594
-
595
- Notice older zlib to enable our replacement uncompress2()
596
- automatically.
597
-
598
- Will merge to 'master'.
599
- source: <xmqqr18x3s5s.fsf@gitster.g>
600
-
601
-
841
* js/apply-partial-clone-filters-recursively (2022-02-09) 1 commit
603
- - clone, submodule: pass partial clone filters to submodules
842
+ (merged to 'next' on 2022-02-16 at 4b3852bd52)
843
+ + clone, submodule: pass partial clone filters to submodules
844
845
"git clone --filter=... --recurse-submodules" only makes the
846
top-level a partial clone, while submodules are fully cloned. This
847
behaviour is changed to pass the same filter down to the submodules.
848
609
- Will merge to 'next'?
849
+ Will merge to 'master'.
850
source: <690d2316ad518ea4551821b2b3aa652996858475.1644034886.git.steadmon@google.com>
851
852
@@ -654,19 +894,18 @@ Release tarballs are available at:
894
895
896
* ds/sparse-checkout-requires-per-worktree-config (2022-02-08) 6 commits
657
- - config: make git_configset_get_string_tmp() private
658
- - worktree: copy sparse-checkout patterns and config on add
659
- - sparse-checkout: set worktree-config correctly
660
- - config: add repo_config_set_worktree_gently()
661
- - worktree: create init_worktree_config()
662
- - Documentation: add extensions.worktreeConfig details
897
+ (merged to 'next' on 2022-02-15 at f86bec6da9)
898
+ + config: make git_configset_get_string_tmp() private
899
+ + worktree: copy sparse-checkout patterns and config on add
900
+ + sparse-checkout: set worktree-config correctly
901
+ + config: add repo_config_set_worktree_gently()
902
+ + worktree: create init_worktree_config()
903
+ + Documentation: add extensions.worktreeConfig details
904
905
"git sparse-checkout" wants to work with per-worktree configration,
906
but did not work well in a worktree attached to a bare repository.
907
667
- Will merge to 'next'?
668
- cf. <20220204081336.3194538-1-newren@gmail.com>
669
- cf. <CAPig+cRrRxuTeByhKkLs_KDaWY8-r4+jrwT83A-r+sBQsmebMw@mail.gmail.com>
908
+ Will merge to 'master'.
909
source: <pull.1101.v6.git.1644269583.gitgitgadget@gmail.com>
910
911
@@ -688,93 +927,25 @@ Release tarballs are available at:
927
source: <cover.1642406989.git.ps@pks.im>
928
929
691
-* ld/sparse-index-bash-completion (2022-02-08) 3 commits
692
- (merged to 'next' on 2022-02-08 at ac1e968ab8)
693
- + completion: handle unusual characters for sparse-checkout
694
- + completion: improve sparse-checkout cone mode directory completion
695
- + completion: address sparse-checkout issues
696
-
697
- The command line completion (in contrib/) learns to complete
698
- arguments give to "git sparse-checkout" command.
699
-
700
- Will merge to 'master'.
701
- source: <pull.1108.v7.git.1644255105.gitgitgadget@gmail.com>
702
-
703
-
704
-* jz/rev-list-exclude-first-parent-only (2022-01-12) 1 commit
705
- (merged to 'next' on 2022-02-09 at f26a82c66a)
706
- + git-rev-list: add --exclude-first-parent-only flag
707
-
708
- "git log" and friends learned an option --exclude-first-parent-only
709
- to propagate UNINTERESTING bit down only along the first-parent
710
- chain, just like --first-parent option shows commits that lack the
711
- UNINTERESTING bit only along the first-parent chain.
712
-
713
- Will merge to 'master'.
714
- source: <20220111213941.30129-1-jerry@skydio.com>
715
-
716
-
930
* en/present-despite-skipped (2022-01-14) 6 commits
718
- - Accelerate clear_skip_worktree_from_present_files() by caching
719
- - Update documentation related to sparsity and the skip-worktree bit
720
- - repo_read_index: clear SKIP_WORKTREE bit from files present in worktree
721
- - unpack-trees: fix accidental loss of user changes
722
- - t1011: add testcase demonstrating accidental loss of user modifications
723
- - Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped
724
- (this branch uses vd/sparse-clean-etc.)
931
+ (merged to 'next' on 2022-02-15 at 960873fdad)
932
+ + Accelerate clear_skip_worktree_from_present_files() by caching
933
+ + Update documentation related to sparsity and the skip-worktree bit
934
+ + repo_read_index: clear SKIP_WORKTREE bit from files present in worktree
935
+ + unpack-trees: fix accidental loss of user changes
936
+ + t1011: add testcase demonstrating accidental loss of user modifications
937
+ + Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped
938
939
In sparse-checkouts, files mis-marked as missing from the working tree
940
could lead to later problems. Such files were hard to discover, and
941
harder to correct. Automatically detecting and correcting the marking
942
of such files has been added to avoid these problems.
943
731
- Will merge to 'next'?
944
+ Will merge to 'master'.
945
cf. <20220204081336.3194538-1-newren@gmail.com>
946
source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>
947
948
736
-* vd/sparse-clean-etc (2022-01-13) 9 commits
737
- (merged to 'next' on 2022-02-09 at 5928dbd25e)
738
- + update-index: reduce scope of index expansion in do_reupdate
739
- + update-index: integrate with sparse index
740
- + update-index: add tests for sparse-checkout compatibility
741
- + checkout-index: integrate with sparse index
742
- + checkout-index: add --ignore-skip-worktree-bits option
743
- + checkout-index: expand sparse checkout compatibility tests
744
- + clean: integrate with sparse index
745
- + reset: reorder wildcard pathspec conditions
746
- + reset: fix validation in sparse index test
747
- (this branch is used by en/present-despite-skipped.)
748
-
749
- "git update-index", "git checkout-index", and "git clean" are
750
- taught to work better with the sparse checkout feature.
751
-
752
- Will merge to 'master'.
753
- source: <pull.1109.v2.git.1641924306.gitgitgadget@gmail.com>
754
-
755
-
756
-* en/remerge-diff (2022-02-02) 11 commits
757
- (merged to 'next' on 2022-02-08 at 68b9a8a38b)
758
- + diff-merges: avoid history simplifications when diffing merges
759
- + merge-ort: mark conflict/warning messages from inner merges as omittable
760
- + show, log: include conflict/warning messages in --remerge-diff headers
761
- + diff: add ability to insert additional headers for paths
762
- + merge-ort: format messages slightly different for use in headers
763
- + merge-ort: mark a few more conflict messages as omittable
764
- + merge-ort: capture and print ll-merge warnings in our preferred fashion
765
- + ll-merge: make callers responsible for showing warnings
766
- + log: clean unneeded objects during `log --remerge-diff`
767
- + show, log: provide a --remerge-diff capability
768
- + Merge branch 'ns/tmp-objdir' into en/remerge-diff
769
- (this branch is used by en/merge-tree.)
770
-
771
- "git log --remerge-diff" shows the difference from mechanical merge
772
- result and the merge result that is actually recorded.
773
-
774
- Will merge to 'master'.
775
- source: <pull.1103.v5.git.1643769457.gitgitgadget@gmail.com>
776
-
777
-
949
* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2022-02-11) 1 commit
950
(merged to 'next' on 2022-02-14 at 9abd0dce80)
951
+ fetch-pack: parameterize message containing 'ready' keyword
@@ -801,73 +972,23 @@ Release tarballs are available at:
972
source: <20220129000446.99261-1-chooglen@google.com>
973
974
804
-* hn/reftable-coverity-fixes (2022-01-20) 17 commits
805
- (merged to 'next' on 2022-02-08 at 1baf327a66)
806
- + reftable: add print functions to the record types
807
- + reftable: make reftable_record a tagged union
808
- + reftable: remove outdated file reftable.c
809
- + reftable: implement record equality generically
810
- + reftable: make reftable-record.h function signatures const correct
811
- + reftable: handle null refnames in reftable_ref_record_equal
812
- + reftable: drop stray printf in readwrite_test
813
- + reftable: order unittests by complexity
814
- + reftable: all xxx_free() functions accept NULL arguments
815
- + reftable: fix resource warning
816
- + reftable: ignore remove() return value in stack_test.c
817
- + reftable: check reftable_stack_auto_compact() return value
818
- + reftable: fix resource leak blocksource.c
819
- + reftable: fix resource leak in block.c error path
820
- + reftable: fix OOB stack write in print functions
821
- + Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
822
- + Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
823
-
824
- Problems identified by Coverity in the reftable code have been
825
- corrected.
826
-
827
- Will merge to 'master'.
828
- source: <pull.1152.v6.git.git.1642691534.gitgitgadget@gmail.com>
829
-
830
-
831
-* tb/midx-bitmap-corruption-fix (2022-01-27) 9 commits
832
- (merged to 'next' on 2022-02-08 at a8cc333d78)
833
- + pack-bitmap.c: gracefully fallback after opening pack/MIDX
834
- + midx: read `RIDX` chunk when present
835
- + t/lib-bitmap.sh: parameterize tests over reverse index source
836
- + t5326: move tests to t/lib-bitmap.sh
837
- + t5326: extract `test_rev_exists`
838
- + t5326: drop unnecessary setup
839
- + pack-revindex.c: instrument loading on-disk reverse index
840
- + midx.c: make changing the preferred pack safe
841
- + t5326: demonstrate bitmap corruption after permutation
842
-
843
- A bug that made multi-pack bitmap and the object order out-of-sync
844
- (hence the .midx data gets corrupted) has been fixed.
845
-
846
- Will merge to 'master'.
847
- source: <cover.1643150456.git.me@ttaylorr.com>
848
-
849
-
850
-* ab/grep-patterntype (2022-02-04) 9 commits
851
- - grep: simplify config parsing and option parsing
852
- - grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"
853
- - grep.h: make "grep_opt.pattern_type_option" use its enum
854
- - grep API: call grep_config() after grep_init()
855
- - grep.c: don't pass along NULL callback value
856
- - built-ins: trust the "prefix" from run_builtin()
857
- - grep tests: add missing "grep.patternType" config tests
858
- - log tests: check if grep_config() is called by "log"-like cmds
859
- - grep.h: remove unused "regex_t regexp" from grep_opt
975
+* ab/grep-patterntype (2022-02-15) 10 commits
976
+ (merged to 'next' on 2022-02-16 at 64222759a2)
977
+ + grep: simplify config parsing and option parsing
978
+ + grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"
979
+ + grep.h: make "grep_opt.pattern_type_option" use its enum
980
+ + grep API: call grep_config() after grep_init()
981
+ + grep.c: don't pass along NULL callback value
982
+ + built-ins: trust the "prefix" from run_builtin()
983
+ + grep tests: add missing "grep.patternType" config tests
984
+ + grep tests: create a helper function for "BRE" or "ERE"
985
+ + log tests: check if grep_config() is called by "log"-like cmds
986
+ + grep.h: remove unused "regex_t regexp" from grep_opt
987
988
Some code clean-up in the "git grep" machinery.
989
863
- Looking good, except for the last step.
864
- Code-wise, it is tempted to call it a victory after squashing the
865
- fix-up in, but that does not fix the proposed log message, so...
866
-
867
- Expecting a reroll to update its tests, but otherwise looks ready.
868
- cf. <xmqqv8xui5ah.fsf@gitster.g>
869
- cf. <xmqqmtj6jkuk.fsf@gitster.g>
870
- source: <cover-v10-0.9-00000000000-20220204T211534Z-avarab@gmail.com>
990
+ Will merge to 'master'.
991
+ source: <cover-v11-00.10-00000000000-20220216T000006Z-avarab@gmail.com>
992
993
994
* js/use-builtin-add-i (2021-12-01) 2 commits
@@ -888,18 +1009,19 @@ Release tarballs are available at:
1009
1010
1011
* ab/ambiguous-object-name (2022-01-27) 7 commits
891
- - object-name: re-use "struct strbuf" in show_ambiguous_object()
892
- - object-name: iterate ambiguous objects before showing header
893
- - object-name: show date for ambiguous tag objects
894
- - object-name: make ambiguous object output translatable
895
- - object-name: explicitly handle bad tags in show_ambiguous_object()
896
- - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()
897
- - object-name tests: add tests for ambiguous object blind spots
1012
+ (merged to 'next' on 2022-02-15 at 6028098cfe)
1013
+ + object-name: re-use "struct strbuf" in show_ambiguous_object()
1014
+ + object-name: iterate ambiguous objects before showing header
1015
+ + object-name: show date for ambiguous tag objects
1016
+ + object-name: make ambiguous object output translatable
1017
+ + object-name: explicitly handle bad tags in show_ambiguous_object()
1018
+ + object-name: explicitly handle OBJ_BAD in show_ambiguous_object()
1019
+ + object-name tests: add tests for ambiguous object blind spots
1020
1021
Error output given in response to an ambiguous object name has been
1022
improved.
1023
902
- Will merge to 'next'?
1024
+ Will merge to 'master'.
1025
source: <cover-v8-0.7-00000000000-20220127T052116Z-avarab@gmail.com>
1026
1027
@@ -954,6 +1076,7 @@ Release tarballs are available at:
1076
- fsmonitor: config settings are repository-specific
1077
- fsmonitor-ipc: create client routines for git-fsmonitor--daemon
1078
- fsmonitor: enhance existing comments, clarify trivial response handling
1079
+ (this branch is used by jh/builtin-fsmonitor-part3.)
1080
1081
Built-in fsmonitor (part 2).
1082
source: <pull.1041.v5.git.1644612979.gitgitgadget@gmail.com>
@@ -971,17 +1094,18 @@ Release tarballs are available at:
1094
1095
1096
* ab/only-single-progress-at-once (2022-02-03) 9 commits
974
- - pack-bitmap-write.c: don't return without stop_progress()
975
- - progress API: unify stop_progress{,_msg}(), fix trace2 bug
976
- - progress.c: refactor stop_progress{,_msg}() to use helpers
977
- - progress.c: use dereferenced "progress" variable, not "(*p_progress)"
978
- - progress.h: format and be consistent with progress.c naming
979
- - progress.c tests: test some invalid usage
980
- - progress.c tests: make start/stop commands on stdin
981
- - progress.c test helper: add missing braces
982
- - leak tests: fix a memory leak in "test-progress" helper
1097
+ (merged to 'next' on 2022-02-15 at 97ac92e662)
1098
+ + pack-bitmap-write.c: don't return without stop_progress()
1099
+ + progress API: unify stop_progress{,_msg}(), fix trace2 bug
1100
+ + progress.c: refactor stop_progress{,_msg}() to use helpers
1101
+ + progress.c: use dereferenced "progress" variable, not "(*p_progress)"
1102
+ + progress.h: format and be consistent with progress.c naming
1103
+ + progress.c tests: test some invalid usage
1104
+ + progress.c tests: make start/stop commands on stdin
1105
+ + progress.c test helper: add missing braces
1106
+ + leak tests: fix a memory leak in "test-progress" helper
1107
1108
Further tweaks on progress API.
1109
986
- Will merge to 'next'?
1110
+ Will merge to 'master'.
1111
source: <cover-v9-0.9-00000000000-20220203T213350Z-avarab@gmail.com>