What's cooking (2022/01 #01)
Junio C Hamano committed
Jan 3, 2022 at 17:43 UTC
42d624f18437166c7c7c8b342ec9a981894d3ca6
1 file changed
+236
-203
whats-cooking.txt
+236
-203
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2021, #06; Mon, 27)
4
-X-master-at: 2ae0a9cb8298185a94e5998086f380a355dd8907
5
-X-next-at: 55b058a8bbcc54bd93c733035c995abc7967e539
3
+Subject: What's cooking in git.git (Jan 2022, #01; Mon, 3)
4
+X-master-at: dcc0cd074f0c639a0df20461a301af6d45bd582e
5
+X-next-at: 194610f4cf2df839ebfd040c5da187c8c0162620
6
7
-What's cooking in git.git (Dec 2021, #06; Mon, 27)
7
+What's cooking in git.git (Jan 2022, #01; Mon, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -51,32 +51,106 @@ Release tarballs are available at:
51
52
https://www.kernel.org/pub/software/scm/git/
53
54
+--------------------------------------------------
55
+[Graduated to 'master']
56
+
57
+* en/sparse-checkout-set (2021-12-23) 11 commits
58
+ (merged to 'next' on 2021-12-25 at 510f9eba9a)
59
+ + sparse-checkout: remove stray trailing space
60
+ (merged to 'next' on 2021-12-21 at 36a98aed11)
61
+ + clone: avoid using deprecated `sparse-checkout init`
62
+ + Documentation: clarify/correct a few sparsity related statements
63
+ + git-sparse-checkout.txt: update to document init/set/reapply changes
64
+ + sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}
65
+ + sparse-checkout: enable `set` to initialize sparse-checkout mode
66
+ + sparse-checkout: split out code for tweaking settings config
67
+ + sparse-checkout: disallow --no-stdin as an argument to set
68
+ + sparse-checkout: add sanity-checks on initial sparsity state
69
+ + sparse-checkout: break apart functions for sparse_checkout_(set|add)
70
+ + sparse-checkout: pass use_stdin as a parameter instead of as a global
71
+
72
+ The "init" and "set" subcommands in "git sparse-checkout" have been
73
+ unified for a better user experience and performance.
74
+ source: <pull.1151.v4.git.git.1639454952.gitgitgadget@gmail.com>
75
+
76
+
77
+* es/test-chain-lint (2021-12-13) 19 commits
78
+ (merged to 'next' on 2021-12-21 at d6f56f3248)
79
+ + t6000-t9999: detect and signal failure within loop
80
+ + t5000-t5999: detect and signal failure within loop
81
+ + t4000-t4999: detect and signal failure within loop
82
+ + t0000-t3999: detect and signal failure within loop
83
+ + tests: simplify by dropping unnecessary `for` loops
84
+ + tests: apply modern idiom for exiting loop upon failure
85
+ + tests: apply modern idiom for signaling test failure
86
+ + tests: fix broken &&-chains in `{...}` groups
87
+ + tests: fix broken &&-chains in `$(...)` command substitutions
88
+ + tests: fix broken &&-chains in compound statements
89
+ + tests: use test_write_lines() to generate line-oriented output
90
+ + tests: simplify construction of large blocks of text
91
+ + t9107: use shell parameter expansion to avoid breaking &&-chain
92
+ + t6300: make `%(raw:size) --shell` test more robust
93
+ + t5516: drop unnecessary subshell and command invocation
94
+ + t4202: clarify intent by creating expected content less cleverly
95
+ + t1020: avoid aborting entire test script when one test fails
96
+ + t1010: fix unnoticed failure on Windows
97
+ + t/lib-pager: use sane_unset() to avoid breaking &&-chain
98
+
99
+ Broken &&-chains in the test scripts have been corrected.
100
+ source: <20211209051115.52629-1-sunshine@sunshineco.com>
101
+
102
+
103
+* jc/unleak-log (2021-12-16) 1 commit
104
+ (merged to 'next' on 2021-12-21 at c39506ec86)
105
+ + format-patch: mark rev_info with UNLEAK
106
+
107
+ "git format-patch" uses a single rev_info instance and then exits.
108
+ Mark the structure with UNLEAK() macro to squelch leak sanitizer.
109
+ source: <xmqqee6dz5s9.fsf@gitster.g>
110
+
111
+
112
+* ns/tmp-objdir (2021-12-08) 2 commits
113
+ (merged to 'next' on 2021-12-21 at d316ff36fc)
114
+ + tmp-objdir: disable ref updates when replacing the primary odb
115
+ + tmp-objdir: new API for creating temporary writable databases
116
+ (this branch is used by en/remerge-diff.)
117
+
118
+ New interface into the tmp-objdir API to help in-core use of the
119
+ quarantine feature.
120
+ source: <pull.1091.v3.git.1638828305.gitgitgadget@gmail.com>
121
+
122
--------------------------------------------------
123
[New Topics]
124
57
-* ab/makefile-hook-list-dependency-fix (2021-12-25) 1 commit
58
- - Makefile: correct the dependency graph of hook-list.h
125
+* en/merge-ort-renorm-with-rename-delete-conflict-fix (2021-12-30) 1 commit
126
+ - merge-ort: fix bug with renormalization and rename/delete conflicts
127
60
- Fix dependency rules to generate hook-list.h header file.
128
+ A corner case bug in the ort merge strategy has been corrected.
129
130
Will merge to 'next'.
63
- source: <patch-1.1-1fafa6c643b-20211217T001137Z-avarab@gmail.com>
131
+ source: <pull.1174.git.git.1640650846612.gitgitgadget@gmail.com>
132
133
66
-* ab/makefile-msgfmt-wo-stats (2021-12-25) 1 commit
67
- - Makefile: don't invoke msgfmt with --statistics
134
+* jc/find-header (2022-01-03) 1 commit
135
+ - receive-pack.c: consolidate find header logic
136
69
- Make the recipe that runs msgfmt less noisy.
137
+ Code clean-up.
138
71
- Will merge to 'next'.
72
- source: <patch-1.1-58408f384e7-20211217T000729Z-avarab@gmail.com>
139
+ Will merge to 'next'?
140
+ source: <pull.1125.v2.git.git.1640758765723.gitgitgadget@gmail.com>
141
142
75
-* ab/makefile-pager-env-is-used-only-by-pager.c (2021-12-25) 1 commit
76
- - Makefile: move -DPAGER_ENV from BASIC_CFLAGS to EXTRA_CPPFLAGS
143
+* jc/name-rev-stdin (2022-01-03) 4 commits
144
+ - fixup! name-rev.c: use strbuf_getline instead of limited size buffer
145
+ - fixup! name-rev: deprecate --stdin in favor of --annotate-text
146
+ - name-rev.c: use strbuf_getline instead of limited size buffer
147
+ - name-rev: deprecate --stdin in favor of --annotate-text
148
78
- Will merge to 'next'.
79
- source: <patch-1.1-90d1e77ad5e-20211217T001628Z-avarab@gmail.com>
149
+ "git name-rev --stdin" does not behave like usual "--stdin" at
150
+ all. Start the process of renaming it to "--annotate-stdin".
151
+
152
+ Expecting a reroll.
153
+ source: <pull.1171.v3.git.git.1641221261.gitgitgadget@gmail.com>
154
155
--------------------------------------------------
156
[Stalled]
@@ -131,14 +205,43 @@ Release tarballs are available at:
205
--------------------------------------------------
206
[Cooking]
207
208
+* ab/makefile-hook-list-dependency-fix (2021-12-25) 1 commit
209
+ (merged to 'next' on 2022-01-03 at 8c8ca0cbce)
210
+ + Makefile: correct the dependency graph of hook-list.h
211
+
212
+ Fix dependency rules to generate hook-list.h header file.
213
+
214
+ Will merge to 'master'.
215
+ source: <patch-1.1-1fafa6c643b-20211217T001137Z-avarab@gmail.com>
216
+
217
+
218
+* ab/makefile-msgfmt-wo-stats (2021-12-25) 1 commit
219
+ (merged to 'next' on 2022-01-03 at 2e2097c310)
220
+ + Makefile: don't invoke msgfmt with --statistics
221
+
222
+ Make the recipe that runs msgfmt less noisy.
223
+
224
+ Will merge to 'master'.
225
+ source: <patch-1.1-58408f384e7-20211217T000729Z-avarab@gmail.com>
226
+
227
+
228
+* ab/makefile-pager-env-is-used-only-by-pager.c (2021-12-25) 1 commit
229
+ (merged to 'next' on 2022-01-03 at 7ab1e1c5c4)
230
+ + Makefile: move -DPAGER_ENV from BASIC_CFLAGS to EXTRA_CPPFLAGS
231
+
232
+ Will merge to 'master'.
233
+ source: <patch-1.1-90d1e77ad5e-20211217T001628Z-avarab@gmail.com>
234
+
235
+
236
* ab/do-not-limit-stash-help-to-push (2021-12-16) 1 commit
135
- - stash: don't show "git stash push" usage on bad "git stash" usage
237
+ (merged to 'next' on 2022-01-03 at adfc0c1f17)
238
+ + stash: don't show "git stash push" usage on bad "git stash" usage
239
240
"git stash" by default triggers its "push" action, but its
241
implementation also made "git stash -h" to show short help only for
242
"git stash push", which has been corrected.
243
141
- Will merge to 'next'.
244
+ Will merge to 'master'.
245
source: <patch-v3-1.1-6b33b104c84-20211216T125317Z-avarab@gmail.com>
246
247
@@ -166,14 +269,15 @@ Release tarballs are available at:
269
270
271
* ws/fast-export-with-revision-options (2021-12-21) 1 commit
169
- - fast-export: fix surprising behavior with --first-parent
272
+ (merged to 'next' on 2022-01-03 at f94f7f70b6)
273
+ + fast-export: fix surprising behavior with --first-parent
274
275
Use of certain "git rev-list" options with "git fast-export"
276
created nonsense results (the worst two of which being "--reverse"
277
and "--invert-grep --grep=<foo>"). The use of "--first-parent" is
278
made to behave a bit more sensible than before.
279
176
- Will merge to 'next'.
280
+ Will merge to 'master'.
281
source: <pull.1084.v2.git.1639037637231.gitgitgadget@gmail.com>
282
283
@@ -187,17 +291,6 @@ Release tarballs are available at:
291
source: <xmqqtuf86t7z.fsf_-_@gitster.g>
292
293
190
-* jc/unleak-log (2021-12-16) 1 commit
191
- (merged to 'next' on 2021-12-21 at c39506ec86)
192
- + format-patch: mark rev_info with UNLEAK
193
-
194
- "git format-patch" uses a single rev_info instance and then exits.
195
- Mark the structure with UNLEAK() macro to squelch leak sanitizer.
196
-
197
- Will merge to 'master'.
198
- source: <xmqqee6dz5s9.fsf@gitster.g>
199
-
200
-
294
* ds/repack-fixlets (2021-12-20) 2 commits
295
(merged to 'next' on 2021-12-27 at 8f8474ae84)
296
+ repack: make '--quiet' disable progress
@@ -232,24 +325,26 @@ Release tarballs are available at:
325
326
327
* jh/p4-human-unit-numbers (2021-12-20) 2 commits
235
- - git-p4: show progress as an integer
236
- - git-p4: print size values in appropriate units
328
+ (merged to 'next' on 2022-01-03 at c385766ff4)
329
+ + git-p4: show progress as an integer
330
+ + git-p4: print size values in appropriate units
331
332
The way "git p4" shows file sizes in its output has been updated to
333
use human-readable units.
334
241
- Will merge to 'next'.
335
+ Will merge to 'master'.
336
source: <20211219154028.3288756-1-jholdsworth@nvidia.com>
337
338
339
* jz/apply-3-corner-cases (2021-12-20) 1 commit
246
- - git-apply: skip threeway in add / rename cases
340
+ (merged to 'next' on 2022-01-03 at cb8e19c304)
341
+ + git-apply: skip threeway in add / rename cases
342
343
"git apply --3way" bypasses the attempt to do a three-way
344
application in more cases to address the regression caused by the
345
recent change to use direct application as a fallback.
346
252
- Will merge to 'next'.
347
+ Will merge to 'master'.
348
source: <20211217224328.7646-1-jerry@skydio.com>
349
350
@@ -310,21 +405,19 @@ Release tarballs are available at:
405
406
407
* ds/sparse-checkout-requires-per-worktree-config (2021-12-21) 5 commits
313
- - sparse-checkout: use repo_config_set_worktree_gently()
314
- - config: add repo_config_set_worktree_gently()
315
- - worktree: add upgrade_to_worktree_config()
316
- - config: make some helpers repo-aware
317
- - setup: use a repository when upgrading format
408
+ . sparse-checkout: use repo_config_set_worktree_gently()
409
+ . config: add repo_config_set_worktree_gently()
410
+ . worktree: add upgrade_to_worktree_config()
411
+ . config: make some helpers repo-aware
412
+ . setup: use a repository when upgrading format
413
414
"git sparse-checkout" wants to work with per-worktree configration,
415
but did not work well in a worktree attached to a bare repository.
321
-
322
- Expecting a redesign?
323
- cf. <CABPp-BG7nwsdEYrnfqhAbWU4ndJHcqGf6RS_6DzJittuNVLvoA@mail.gmail.com>
416
source: <pull.1101.v2.git.1640114048.gitgitgadget@gmail.com>
417
418
327
-* en/remerge-diff (2021-12-25) 9 commits
419
+* en/remerge-diff (2021-12-30) 10 commits
420
+ - merge-ort: mark conflict/warning messages from inner merges as omittable
421
- show, log: include conflict/warning messages in --remerge-diff headers
422
- diff: add ability to insert additional headers for paths
423
- merge-ort: format messages slightly different for use in headers
@@ -334,11 +427,10 @@ Release tarballs are available at:
427
- log: clean unneeded objects during `log --remerge-diff`
428
- show, log: provide a --remerge-diff capability
429
- Merge branch 'ns/tmp-objdir' into en/remerge-diff
337
- (this branch uses ns/tmp-objdir.)
430
431
"git log --remerge-diff" shows the difference from mechanical merge
432
result and the merge result that is actually recorded.
341
- source: <pull.1103.v2.git.1640419159.gitgitgadget@gmail.com>
433
+ source: <pull.1103.v3.git.1640907369.gitgitgadget@gmail.com>
434
435
436
* gc/fetch-negotiate-only-early-return (2021-12-21) 3 commits
@@ -352,58 +444,63 @@ Release tarballs are available at:
444
445
446
* hn/refs-debug-update (2021-12-22) 3 commits
355
- - refs: centralize initialization of the base ref_store.
356
- - refs: print error message in debug output
357
- - refs: pass gitdir to packed_ref_store_create
447
+ (merged to 'next' on 2022-01-03 at 1cd451c66c)
448
+ + refs: centralize initialization of the base ref_store.
449
+ + refs: print error message in debug output
450
+ + refs: pass gitdir to packed_ref_store_create
451
452
Debugging support for refs API.
453
361
- Will merge to 'next'.
454
+ Will merge to 'master'.
455
source: <pull.1163.v2.git.git.1640196714.gitgitgadget@gmail.com>
456
457
458
* hn/test-ref-store-show-hash-algo (2021-12-21) 1 commit
366
- - test-ref-store: print hash algorithm
459
+ (merged to 'next' on 2022-01-03 at 3cdbfeeaf1)
460
+ + test-ref-store: print hash algorithm
461
462
Debugging support for refs API.
463
370
- Will merge to 'next'.
464
+ Will merge to 'master'.
465
source: <pull.1167.git.git.1640092500725.gitgitgadget@gmail.com>
466
467
468
* ja/perf-use-specified-shell (2021-12-25) 1 commit
375
- - t/perf: do not run tests in user's $SHELL
469
+ (merged to 'next' on 2022-01-03 at 8ca35ee3d0)
470
+ + t/perf: do not run tests in user's $SHELL
471
472
Perf tests were run with end-user's shell, but it has been
473
corrected to use the shell specified by $TEST_SHELL_PATH.
474
380
- Will merge to 'next'.
475
+ Will merge to 'master'.
476
source: <20211225081656.1311583-1-aclopte@gmail.com>
477
478
479
* js/l10n-mention-ngettext-early-in-readme (2021-12-21) 1 commit
385
- - l10n: README: call more attention to plural strings
480
+ (merged to 'next' on 2022-01-03 at a644f898ce)
481
+ + l10n: README: call more attention to plural strings
482
483
Localization doc update.
484
389
- Will merge to 'next'.
485
+ Will merge to 'master'.
486
source: <25107068cbbf8c9ce6886e66e25dff19e072583f.1639425295.git.steadmon@google.com>
487
488
489
* ab/reflog-prep (2021-12-22) 9 commits
394
- - reflog + refs-backend: move "verbose" out of the backend
395
- - refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUN
396
- - reflog: reduce scope of "struct rev_info"
397
- - reflog expire: don't use lookup_commit_reference_gently()
398
- - reflog expire: refactor & use "tip_commit" only for UE_NORMAL
399
- - reflog expire: use "switch" over enum values
400
- - reflog: change one->many worktree->refnames to use a string_list
401
- - reflog expire: narrow scope of "cb" in cmd_reflog_expire()
402
- - reflog delete: narrow scope of "cmd" passed to count_reflog_ent()
490
+ (merged to 'next' on 2022-01-03 at 07d2d78d86)
491
+ + reflog + refs-backend: move "verbose" out of the backend
492
+ + refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUN
493
+ + reflog: reduce scope of "struct rev_info"
494
+ + reflog expire: don't use lookup_commit_reference_gently()
495
+ + reflog expire: refactor & use "tip_commit" only for UE_NORMAL
496
+ + reflog expire: use "switch" over enum values
497
+ + reflog: change one->many worktree->refnames to use a string_list
498
+ + reflog expire: narrow scope of "cb" in cmd_reflog_expire()
499
+ + reflog delete: narrow scope of "cmd" passed to count_reflog_ent()
500
501
Code refactoring in the reflog part of refs API.
502
406
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
source: <cover-v3-0.9-00000000000-20211222T040557Z-avarab@gmail.com>
505
506
@@ -418,35 +515,38 @@ Release tarballs are available at:
515
516
517
* hn/ref-api-tests-update (2021-12-22) 4 commits
421
- - t7004: use "test-tool ref-store" for reflog inspection
422
- - t7004: create separate tags for different tests
423
- - t5550: require REFFILES
424
- - t5540: require REFFILES
518
+ (merged to 'next' on 2022-01-03 at 6815d4d8c1)
519
+ + t7004: use "test-tool ref-store" for reflog inspection
520
+ + t7004: create separate tags for different tests
521
+ + t5550: require REFFILES
522
+ + t5540: require REFFILES
523
524
Test updates.
525
428
- Will merge to 'next'.
526
+ Will merge to 'master'.
527
source: <pull.1168.git.git.1640170784.gitgitgadget@gmail.com>
528
529
530
* jh/p4-remove-unused (2021-12-22) 2 commits
433
- - git-p4: remove "rollback" verb
434
- - git-p4: remove "debug" verb
531
+ (merged to 'next' on 2022-01-03 at 43f61b2fef)
532
+ + git-p4: remove "rollback" verb
533
+ + git-p4: remove "debug" verb
534
535
Remove a few commands from "git p4" that aren't very useful.
536
438
- Will merge to 'next'.
537
+ Will merge to 'master'.
538
source: <20211222145552.93786-1-jholdsworth@nvidia.com>
539
540
541
* hn/reftable-fixes (2021-12-23) 3 commits
443
- - reftable: support preset file mode for writing
444
- - reftable: signal overflow
445
- - reftable: fix typo in header
542
+ (merged to 'next' on 2022-01-03 at 532f9bbb27)
543
+ + reftable: support preset file mode for writing
544
+ + reftable: signal overflow
545
+ + reftable: fix typo in header
546
547
Assorted fixlets in reftable code.
548
449
- Will merge to 'next'.
549
+ Will merge to 'master'.
550
source: <pull.1164.git.git.1640287790.gitgitgadget@gmail.com>
551
552
@@ -467,9 +567,8 @@ Release tarballs are available at:
567
source: <20211216134619.2048348-1-jholdsworth@nvidia.com>
568
569
470
-* ds/sparse-checkout-malformed-pattern-fix (2021-12-25) 4 commits
471
- (merged to 'next' on 2021-12-27 at c410caf527)
472
- + fixup! sparse-checkout: fix OOM error with mixed patterns
570
+* ds/sparse-checkout-malformed-pattern-fix (2021-12-30) 3 commits
571
+ (merged to 'next' on 2021-12-30 at c8b2ade48c)
572
+ sparse-checkout: refuse to add to bad patterns
573
+ sparse-checkout: fix OOM error with mixed patterns
574
+ sparse-checkout: fix segfault on malformed patterns
@@ -519,28 +618,6 @@ Release tarballs are available at:
618
source: <20211214194626.33814-1-jacob@gitlab.com>
619
620
522
-* en/sparse-checkout-set (2021-12-23) 11 commits
523
- (merged to 'next' on 2021-12-25 at 510f9eba9a)
524
- + sparse-checkout: remove stray trailing space
525
- (merged to 'next' on 2021-12-21 at 36a98aed11)
526
- + clone: avoid using deprecated `sparse-checkout init`
527
- + Documentation: clarify/correct a few sparsity related statements
528
- + git-sparse-checkout.txt: update to document init/set/reapply changes
529
- + sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}
530
- + sparse-checkout: enable `set` to initialize sparse-checkout mode
531
- + sparse-checkout: split out code for tweaking settings config
532
- + sparse-checkout: disallow --no-stdin as an argument to set
533
- + sparse-checkout: add sanity-checks on initial sparsity state
534
- + sparse-checkout: break apart functions for sparse_checkout_(set|add)
535
- + sparse-checkout: pass use_stdin as a parameter instead of as a global
536
-
537
- The "init" and "set" subcommands in "git sparse-checkout" have been
538
- unified for a better user experience and performance.
539
-
540
- Will merge to 'master'.
541
- source: <pull.1151.v4.git.git.1639454952.gitgitgadget@gmail.com>
542
-
543
-
621
* hn/reftable-coverity-fixes (2021-12-22) 18 commits
622
- reftable: be more paranoid about 0-length memcpy calls
623
- reftable: add print functions to the record types
@@ -587,34 +664,6 @@ Release tarballs are available at:
664
source: <cover.1639446906.git.me@ttaylorr.com>
665
666
590
-* es/test-chain-lint (2021-12-13) 19 commits
591
- (merged to 'next' on 2021-12-21 at d6f56f3248)
592
- + t6000-t9999: detect and signal failure within loop
593
- + t5000-t5999: detect and signal failure within loop
594
- + t4000-t4999: detect and signal failure within loop
595
- + t0000-t3999: detect and signal failure within loop
596
- + tests: simplify by dropping unnecessary `for` loops
597
- + tests: apply modern idiom for exiting loop upon failure
598
- + tests: apply modern idiom for signaling test failure
599
- + tests: fix broken &&-chains in `{...}` groups
600
- + tests: fix broken &&-chains in `$(...)` command substitutions
601
- + tests: fix broken &&-chains in compound statements
602
- + tests: use test_write_lines() to generate line-oriented output
603
- + tests: simplify construction of large blocks of text
604
- + t9107: use shell parameter expansion to avoid breaking &&-chain
605
- + t6300: make `%(raw:size) --shell` test more robust
606
- + t5516: drop unnecessary subshell and command invocation
607
- + t4202: clarify intent by creating expected content less cleverly
608
- + t1020: avoid aborting entire test script when one test fails
609
- + t1010: fix unnoticed failure on Windows
610
- + t/lib-pager: use sane_unset() to avoid breaking &&-chain
611
-
612
- Broken &&-chains in the test scripts have been corrected.
613
-
614
- Will merge to 'master'.
615
- source: <20211209051115.52629-1-sunshine@sunshineco.com>
616
-
617
-
667
* jc/flex-array-definition (2021-12-08) 1 commit
668
(merged to 'next' on 2021-12-27 at 9db6a814b7)
669
+ flex-array: simplify compiler-specific workaround
@@ -654,7 +703,8 @@ Release tarballs are available at:
703
source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>
704
705
657
-* ja/i18n-similar-messages (2021-12-05) 10 commits
706
+* ja/i18n-similar-messages (2022-01-03) 11 commits
707
+ - i18n: turn even more messages into "cannot be used together" ones
708
- i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
709
- i18n: factorize "--foo outside a repository"
710
- i18n: refactor "unrecognized %(foo) argument" strings
@@ -662,34 +712,33 @@ Release tarballs are available at:
712
- i18n: factorize "--foo requires --bar" and the like
713
- i18n: tag.c factorize i18n strings
714
- i18n: standardize "cannot open" and "cannot read"
665
- - i18n: turn "options are incompatible" into "are mutually exclusive"
715
+ - i18n: turn "options are incompatible" into "cannot be used together"
716
- i18n: refactor "%s, %s and %s are mutually exclusive"
717
- i18n: refactor "foo and bar are mutually exclusive"
718
719
Similar message templates have been consolidated so that
720
translators need to work on fewer number of messages.
721
672
- Expecting a reroll.
673
- cf. <2447705.sFPtriHfYS@cayenne>
674
- source: <pull.1088.git.1638514909.gitgitgadget@gmail.com>
722
+ cf. <48262743.WQR3eRXon5@cayenne>
723
+ source: <pull.1088.v4.git.1641143745.gitgitgadget@gmail.com>
724
725
726
* ab/usage-die-message (2021-12-07) 6 commits
678
- - config API: use get_error_routine(), not vreportf()
679
- - usage.c + gc: add and use a die_message_errno()
680
- - gc: return from cmd_gc(), don't call exit()
681
- - usage.c API users: use die_message() for error() + exit 128
682
- - usage.c API users: use die_message() for "fatal :" + exit 128
683
- - usage.c: add a die_message() routine
727
+ (merged to 'next' on 2022-01-03 at 0ef3860099)
728
+ + config API: use get_error_routine(), not vreportf()
729
+ + usage.c + gc: add and use a die_message_errno()
730
+ + gc: return from cmd_gc(), don't call exit()
731
+ + usage.c API users: use die_message() for error() + exit 128
732
+ + usage.c API users: use die_message() for "fatal :" + exit 128
733
+ + usage.c: add a die_message() routine
734
735
Code clean-up to hide vreportf() from public API.
736
687
- Will merge to 'next'.
737
+ Will merge to 'master'.
738
source: <cover-v2-0.6-00000000000-20211207T182419Z-avarab@gmail.com>
739
740
691
-* ab/cat-file (2021-12-25) 11 commits
692
- - fixup! cat-file: fix remaining usage bugs
741
+* ab/cat-file (2021-12-30) 10 commits
742
- cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
743
- object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
744
- cat-file: correct and improve usage information
@@ -703,23 +752,23 @@ Release tarballs are available at:
752
753
Assorted updates to "git cat-file", especially "-h".
754
706
- Will merge to 'next'?
707
- source: <cover-v5-00.10-00000000000-20211222T041050Z-avarab@gmail.com>
755
+ Will merge to 'next'.
756
+ source: <cover-v6-00.10-00000000000-20211228T132637Z-avarab@gmail.com>
757
758
759
* ab/grep-patterntype (2021-12-27) 8 commits
711
- - grep: simplify config parsing and option parsing
712
- - grep API: call grep_config() after grep_init()
713
- - grep.c: don't pass along NULL callback value
714
- - built-ins: trust the "prefix" from run_builtin()
715
- - fixup! grep tests: add missing "grep.patternType" config tests
716
- - grep tests: add missing "grep.patternType" config tests
717
- - log tests: check if grep_config() is called by "log"-like cmds
718
- - grep.h: remove unused "regex_t regexp" from grep_opt
760
+ . grep: simplify config parsing and option parsing
761
+ . grep API: call grep_config() after grep_init()
762
+ . grep.c: don't pass along NULL callback value
763
+ . built-ins: trust the "prefix" from run_builtin()
764
+ . fixup! grep tests: add missing "grep.patternType" config tests
765
+ . grep tests: add missing "grep.patternType" config tests
766
+ . log tests: check if grep_config() is called by "log"-like cmds
767
+ . grep.h: remove unused "regex_t regexp" from grep_opt
768
769
Some code clean-up in the "git grep" machinery.
770
722
- The last step is still broken; earlier clean-ups may still be worth keeping.
771
+ Reroll exists.
772
source: <cover-v6-0.7-00000000000-20211226T223035Z-avarab@gmail.com>
773
774
@@ -791,7 +840,7 @@ Release tarballs are available at:
840
source: <pull.1086.v3.git.1638758742741.gitgitgadget@gmail.com>
841
842
794
-* ab/ambiguous-object-name (2021-11-26) 6 commits
843
+* ab/ambiguous-object-name (2021-12-30) 6 commits
844
- object-name: re-use "struct strbuf" in show_ambiguous_object()
845
- object-name: iterate ambiguous objects before showing header
846
- object-name: show date for ambiguous tag objects
@@ -801,11 +850,7 @@ Release tarballs are available at:
850
851
Error output given in response to an ambiguous object name has been
852
improved.
804
-
805
- An earlier iteration that was much smaller had seen some reviews,
806
- but the latest round enlarged its scope and needs to be reviewed
807
- afresh.
808
- source: <patch-v5-6.6-78bb0995f08-20211125T215529Z-avarab@gmail.com>
853
+ source: <cover-v6-0.6-00000000000-20211228T143223Z-avarab@gmail.com>
854
855
856
* en/keep-cwd (2021-12-09) 11 commits
@@ -835,26 +880,32 @@ Release tarballs are available at:
880
source: <pull.1140.v6.git.git.1639026515.gitgitgadget@gmail.com>
881
882
838
-* tl/ls-tree-oid-only (2021-12-21) 1 commit
839
- - ls-tree.c: support `--object-only` option for "git-ls-tree"
883
+* tl/ls-tree-oid-only (2022-01-03) 8 commits
884
+ - ls-tree.c: introduce "--format" option
885
+ - ls-tree.c: introduce struct "shown_data"
886
+ - ls-tree.c: support --object-only option for "git-ls-tree"
887
+ - ls-tree: split up the "init" part of show_tree()
888
+ - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"
889
+ - ls-tree: use "enum object_type", not {blob,tree,commit}_type
890
+ - ls-tree: add missing braces to "else" arms
891
+ - ls-tree: remove commented-out code
892
893
"git ls-tree" learns "--oid-only" option, similar to "--name-only".
842
-
843
- Will merge to 'next'?
844
- source: <cover.1639721750.git.dyroneteng@gmail.com>
894
+ source: <cover.1641043500.git.dyroneteng@gmail.com>
895
896
897
* ds/fetch-pull-with-sparse-index (2021-12-22) 5 commits
848
- - test-read-cache: remove --table, --expand options
849
- - t1091/t3705: remove 'test-tool read-cache --table'
850
- - t1092: replace 'read-cache --table' with 'ls-files --sparse'
851
- - ls-files: add --sparse option
852
- - fetch/pull: use the sparse index
898
+ (merged to 'next' on 2022-01-03 at f58da4a878)
899
+ + test-read-cache: remove --table, --expand options
900
+ + t1091/t3705: remove 'test-tool read-cache --table'
901
+ + t1092: replace 'read-cache --table' with 'ls-files --sparse'
902
+ + ls-files: add --sparse option
903
+ + fetch/pull: use the sparse index
904
905
"git fetch" and "git pull" are now declared sparse-index clean.
906
Also "git ls-files" learns the "--sparse" option to help debugging.
907
857
- Will merge to 'next'.
908
+ Will merge to 'master'.
909
source: <pull.1080.v4.git.1640182856.gitgitgadget@gmail.com>
910
911
@@ -895,14 +946,14 @@ Release tarballs are available at:
946
source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>
947
948
898
-* jc/doc-submitting-patches-choice-of-base (2021-12-23) 1 commit
949
+* jc/doc-submitting-patches-choice-of-base (2021-12-30) 1 commit
950
- SubmittingPatchs: clarify choice of base and testing
951
952
Extend the guidance to choose the base commit to build your work
953
on, and hint/nudge contributors to read others' changes.
954
904
- Needs review.
905
- source: <xmqq5yre7w5o.fsf@gitster.g>
955
+ Will merge to 'next'.
956
+ source: <xmqqh7apsv6s.fsf_-_@gitster.g>
957
958
959
* ab/config-based-hooks-2 (2021-12-22) 17 commits
@@ -936,16 +987,17 @@ Release tarballs are available at:
987
988
989
* js/branch-track-inherit (2021-12-20) 3 commits
939
- - config: require lowercase for branch.*.autosetupmerge
940
- - branch: add flags and config to inherit tracking
941
- - branch: accept multiple upstream branches for tracking
990
+ (merged to 'next' on 2022-01-03 at ab5fb34db3)
991
+ + config: require lowercase for branch.*.autosetupmerge
992
+ + branch: add flags and config to inherit tracking
993
+ + branch: accept multiple upstream branches for tracking
994
(this branch is used by gc/branch-recurse-submodules.)
995
996
"git -c branch.autosetupmerge=inherit branch new old" makes "new"
997
to have the same upstream as the "old" branch, instead of marking
998
"old" itself as its upstream.
999
948
- Will merge to 'next'.
1000
+ Will merge to 'master'.
1001
source: <cover.1640039978.git.steadmon@google.com>
1002
1003
@@ -990,19 +1042,6 @@ Release tarballs are available at:
1042
source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>
1043
1044
993
-* ns/tmp-objdir (2021-12-08) 2 commits
994
- (merged to 'next' on 2021-12-21 at d316ff36fc)
995
- + tmp-objdir: disable ref updates when replacing the primary odb
996
- + tmp-objdir: new API for creating temporary writable databases
997
- (this branch is used by en/remerge-diff.)
998
-
999
- New interface into the tmp-objdir API to help in-core use of the
1000
- quarantine feature.
1001
-
1002
- Will merge to 'master'.
1003
- source: <pull.1091.v3.git.1638828305.gitgitgadget@gmail.com>
1004
-
1005
-
1045
* es/superproject-aware-submodules (2021-11-18) 5 commits
1046
- submodule: use config to find superproject worktree
1047
- submodule: record superproject gitdir during 'update'
@@ -1018,8 +1057,7 @@ Release tarballs are available at:
1057
source: <20211117005701.371808-1-emilyshaffer@google.com>
1058
1059
1021
-* ab/only-single-progress-at-once (2021-11-03) 8 commits
1022
- - progress.c: add & assert a "global_progress" variable
1060
+* ab/only-single-progress-at-once (2022-01-03) 7 commits
1061
- various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)
1062
- pack-bitmap-write.c: don't return without stop_progress()
1063
- progress.c: add temporary variable from progress struct
@@ -1029,12 +1067,7 @@ Release tarballs are available at:
1067
- leak tests: fix a memory leaks in "test-progress" helper
1068
1069
Further tweaks on progress API.
1032
-
1033
- Needs review.
1034
- The last three rounds has seen little reaction, even though earlier
1035
- round saw a lot of responses. The latest round needs a serious
1036
- review or at least Acks from past commentors.
1037
- source: <cover-v6-0.8-00000000000-20211102T122507Z-avarab@gmail.com>
1070
+ source: <cover-v7-0.7-00000000000-20211217T041945Z-avarab@gmail.com>
1071
1072
--------------------------------------------------
1073
[Discarded]