What's cooking (2022/03 #01)
Junio C Hamano committed
Mar 3, 2022 at 17:27 UTC
df06fd19ba7cc8c6e8f8015ddce7eded726374bc
1 file changed
+324
-93
whats-cooking.txt
+324
-93
@@ -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, #08; Mon, 28)
3
+Subject: What's cooking in git.git (Mar 2022, #01; Thu, 3)
4
X-master-at: 715d08a9e51251ad8290b181b6ac3b9e1f9719d7
5
-X-next-at: 50a0bfa57956f3f2835aabb9a04449ba66e9469b
5
+X-next-at: 4982287a3110faff562d8f552d63eb9647ce28a7
6
7
-What's cooking in git.git (Feb 2022, #08; Mon, 28)
7
+What's cooking in git.git (Mar 2022, #01; Thu, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -49,41 +49,217 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[New Topics]
51
52
-* js/ci-github-workflow-markup (2022-02-25) 9 commits
53
- - ci: call `finalize_test_case_output` a little later
54
- - ci: use `--github-workflow-markup` in the GitHub workflow
55
- - ci: optionally mark up output in the GitHub workflow
56
- - test(junit): avoid line feeds in XML attributes
57
- - tests: refactor --write-junit-xml code
58
- - ci/run-build-and-tests: add some structure to the GitHub workflow output
59
- - ci: make it easier to find failed tests' logs in the GitHub workflow
60
- - ci/run-build-and-tests: take a more high-level view
61
- - ci: fix code style
52
+* jd/userdiff-kotlin (2022-03-03) 1 commit
53
+ - userdiff: add builtin diff driver for Kotlin language.
54
63
- Update the GitHub workflow support to make it quicker to get to the
64
- failing test.
55
+ A new built-in userdiff driver for kotlin.
56
+
57
+ source: <20220303181517.70682-1-jaydeepjd.8914@gmail.com>
58
+
59
+
60
+* ps/fetch-mirror-optim (2022-03-01) 6 commits
61
+ - refs/files-backend: optimize reading of symbolic refs
62
+ - remote: read symbolic refs via `refs_read_symbolic_ref()`
63
+ - refs: add ability for backends to special-case reading of symbolic refs
64
+ - fetch: avoid lookup of commits when not appending to FETCH_HEAD
65
+ - upload-pack: look up "want" lines via commit-graph
66
+ - Merge branch 'ps/fetch-atomic' into ps/fetch-mirror-optim
67
+ (this branch uses ps/fetch-atomic.)
68
+
69
+ Various optimization for "git fetch".
70
+
71
+ Will merge to 'next'.
72
+ source: <cover.1646127015.git.ps@pks.im>
73
+
74
+
75
+* tk/t7063-chmtime-dirs-too (2022-03-01) 2 commits
76
+ - t7063: mtime-mangling instead of delays in untracked cache testing
77
+ - t/helper/test-chmtime: update mingw to support chmtime on directories
78
+
79
+ Teach "test-chmtime" to work on a directory and use it to avoid
80
+ having to wait for a second in a few places in tests.
81
+
82
+ Expecting a reroll.
83
+ cf. <37f66fae-911a-62f1-4711-c9f6c7794911@jeffhostetler.com>
84
+ source: <pull.1166.v2.git.1646127910.gitgitgadget@gmail.com>
85
+
86
+
87
+* ab/hook-tests-updates (2022-03-02) 10 commits
88
+ - tests: change "cat && chmod +x" to use "test_hook"
89
+ - tests: change "mkdir -p && write_script" to use "test_hook"
90
+ - test-lib-functions: add and use a "test_hook" wrapper
91
+ - fetch+push tests: have tests clean up their own mess
92
+ - hook tests: get rid of unnecessary sub-shells
93
+ - tests: indent and add hook setup to "test_expect_success"
94
+ - bugreport tests: tighten up "git bugreport -s hooks" test
95
+ - tests: assume the hooks are disabled by default
96
+ - t5540: don't rely on "hook/post-update.sample"
97
+ - hook tests: turn exit code assertions into a loop
98
+
99
+ Update tests around the use of hook scripts.
100
+
101
+ Expecting a reroll.
102
+ cf. <xmqqzgm8hwwc.fsf@gitster.g>
103
+ cf. <xmqq1qzkhv87.fsf@gitster.g>
104
+ source: <cover-00.10-00000000000-20220302T131859Z-avarab@gmail.com>
105
+
106
+
107
+* ab/keep-git-exit-codes-in-tests (2022-03-02) 15 commits
108
+ - rev-list simplify tests: don't ignore "git" exit code
109
+ - checkout tests: don't ignore "git <cmd>" exit code
110
+ - apply tests: don't ignore "git ls-files" exit code, drop sub-shell
111
+ - gettext tests: don't ignore "test-tool regex" exit code
112
+ - rev-list tests: don't hide abort() in "test_expect_failure"
113
+ - diff tests: don't ignore "git rev-list" exit code
114
+ - notes tests: don't ignore "git" exit code
115
+ - rev-parse tests: don't ignore "git reflog" exit code
116
+ - merge tests: use "test_must_fail" instead of ad-hoc pattern
117
+ - apply tests: use "test_must_fail" instead of ad-hoc pattern
118
+ - diff tests: don't ignore "git diff" exit code in "read" loop
119
+ - diff tests: don't ignore "git diff" exit code
120
+ - read-tree tests: check "diff-files" exit code on failure
121
+ - tests: use "test_stdout_line_count", not "test $(git [...] | wc -l)"
122
+ - tests: change some 'test $(git) = "x"' to test_cmp
123
+
124
+ Updates tests around the use of "test $(git cmd) = constant".
125
+
126
+ Expecting a reroll.
127
+ cf. <xmqqsfryah42.fsf@gitster.g>
128
+ source: <cover-00.15-00000000000-20220302T171755Z-avarab@gmail.com>
129
+
130
+
131
+* ab/plug-random-leaks (2022-03-02) 14 commits
132
+ - repository.c: free the "path cache" in repo_clear()
133
+ - range-diff: plug memory leak in read_patches()
134
+ - range-diff: plug memory leak in common invocation
135
+ - lockfile API users: simplify and don't leak "path"
136
+ - commit-graph: stop fill_oids_from_packs() progress on error and free()
137
+ - commit-graph: fix memory leak in misused string_list API
138
+ - submodule--helper: fix trivial leak in module_add()
139
+ - transport: stop needlessly copying bundle header references
140
+ - bundle: call strvec_clear() on allocated strvec
141
+ - remote-curl.c: free memory in cmd_main()
142
+ - urlmatch.c: add and use a *_release() function
143
+ - diff.c: free "buf" in diff_words_flush()
144
+ - merge-base: free() allocated "struct commit **" list
145
+ - index-pack: fix memory leaks
146
+
147
+ Plug random memory leaks.
148
+
149
+ Will merge to 'next'.
150
+ source: <cover-00.14-00000000000-20220302T170718Z-avarab@gmail.com>
151
+
152
+
153
+* en/merge-ort-align-verbosity-with-recursive (2022-03-01) 1 commit
154
+ - merge-ort: exclude messages from inner merges by default
155
+
156
+ Align the level of verbose output from the ort backend during inner
157
+ merge to that of the recursive backend.
158
+
159
+ Will merge to 'next'.
160
+ source: <pull.1167.git.1646194761463.gitgitgadget@gmail.com>
161
+
162
+
163
+* ep/test-malloc-check-with-glibc-2.34 (2022-03-03) 1 commit
164
+ - test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34
165
+
166
+ The method to trigger malloc check used in our tests no longer work
167
+ with newer versions of glibc.
168
+
169
+ Expecting a reroll.
170
+ cf. <xmqq8rtq8z41.fsf@gitster.g>
171
+ source: <20220303090640.190307-1-gitter.spiros@gmail.com>
172
+
173
+
174
+* gc/parse-tree-indirect-errors (2022-03-01) 1 commit
175
+ - checkout, clone: die if tree cannot be parsed
176
+
177
+ Check the return value from parse_tree_indirect() to turn segfaults
178
+ into calls to die().
179
+
180
+ Will merge to 'next'.
181
+ source: <20220302003613.15567-1-chooglen@google.com>
182
+
183
+
184
+* jc/mailsplit-warn-on-tty (2022-03-03) 1 commit
185
+ - am/apply: warn if we end up reading patches from terminal
186
+
187
+ "git am" can read from the standard input when no mailbox is given
188
+ on the command line, but the end-user gets no indication when it
189
+ happens, making Git appear stuck.
190
+
191
+ source: <xmqqlexq8zqo.fsf@gitster.g>
192
+
193
+
194
+* jc/stash-drop (2022-03-02) 3 commits
195
+ - stash: call reflog_delete() in reflog.c
196
+ - reflog: libify delete reflog function and helpers
197
+ - stash: add tests to ensure reflog --rewrite --updatref behavior
198
+
199
+ "git stash drop" is reimplemented as an internal call to
200
+ reflog_delete() function, instead of invoking "git reflog delete"
201
+ via run_command() API.
202
203
Will merge to 'next'?
67
- source: <pull.1117.git.1643050574.gitgitgadget@gmail.com>
204
+ source: <pull.1218.v4.git.git.1646260044.gitgitgadget@gmail.com>
205
206
70
-* jc/merge-continue-doc (2022-02-28) 1 commit
71
- - merge: 'git merge --continue' is merely 'git commit'
207
+* nj/read-tree-doc-reffix (2022-03-03) 1 commit
208
+ - Documentation: git-read-tree: separate links using commas
209
73
- "git merge" documentation clarifies that "git commit" is sufficient
74
- to conclude an interrupted merge.
75
- source: <xmqq1qzmy55g.fsf@gitster.g>
210
+ Documentation mark-up fix.
211
212
+ Will merge to 'next'.
213
+ source: <20220303161542.11616-1-nihal@nihaljere.xyz>
214
78
-* jk/name-rev-w-genno (2022-02-28) 1 commit
79
- . name-rev: use generation numbers if available
215
81
- "git name-rev" learned to use the generation numbers when setting
82
- the lower bound of searching commits used to explain the revision,
83
- when available, instead of committer time.
216
+* ps/fetch-atomic-fixup (2022-03-03) 1 commit
217
+ - t5503: simplify setup of test which exercises failure of backfill
218
+ (this branch uses ps/fetch-atomic.)
219
+
220
+ Test simplification.
221
+
222
+ Will merge to 'next'.
223
+ source: <cover.1645102965.git.ps@pks.im>
224
+
225
+
226
+* tb/cruft-packs (2022-03-02) 17 commits
227
+ - sha1-file.c: don't freshen cruft packs
228
+ - builtin/gc.c: conditionally avoid pruning objects via loose
229
+ - builtin/repack.c: add cruft packs to MIDX during geometric repack
230
+ - builtin/repack.c: use named flags for existing_packs
231
+ - builtin/repack.c: allow configuring cruft pack generation
232
+ - builtin/repack.c: support generating a cruft pack
233
+ - builtin/pack-objects.c: --cruft with expiration
234
+ - reachable: report precise timestamps from objects in cruft packs
235
+ - reachable: add options to add_unseen_recent_objects_to_traversal
236
+ - builtin/pack-objects.c: --cruft without expiration
237
+ - builtin/pack-objects.c: return from create_object_entry()
238
+ - t/helper: add 'pack-mtimes' test-tool
239
+ - pack-mtimes: support writing pack .mtimes files
240
+ - chunk-format.h: extract oid_version()
241
+ - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
242
+ - pack-mtimes: support reading .mtimes files
243
+ - Documentation/technical: add cruft-packs.txt
244
+
245
+ A mechanism to pack unreachable objects into a "cruft pack",
246
+ instead of ejecting them into loose form to be reclaimed later, has
247
+ been introduced.
248
249
Will merge to 'next'?
86
- source: <20220228215025.325904-2-jacob.e.keller@intel.com>
250
+ source: <cover.1646266835.git.me@ttaylorr.com>
251
+
252
+
253
+* tb/rename-remote-progress (2022-03-03) 2 commits
254
+ - builtin/remote.c: show progress when renaming remote references
255
+ - builtin/remote.c: parse options in 'rename'
256
+
257
+ "git remote rename A B", depending on the number of remote-tracking
258
+ refs involved, takes long time renaming them. The command has been
259
+ taught to show progress bar while making the user wait.
260
+
261
+ Will merge to 'next'?
262
+ source: <d5b0a4b71027619123b7284611692d3a9c128518.1646346287.git.me@ttaylorr.com>
263
264
--------------------------------------------------
265
[Stalled]
@@ -140,6 +316,37 @@ Release tarballs are available at:
316
--------------------------------------------------
317
[Cooking]
318
319
+* js/ci-github-workflow-markup (2022-03-01) 9 commits
320
+ - ci: call `finalize_test_case_output` a little later
321
+ - ci: use `--github-workflow-markup` in the GitHub workflow
322
+ - ci: optionally mark up output in the GitHub workflow
323
+ - test(junit): avoid line feeds in XML attributes
324
+ - tests: refactor --write-junit-xml code
325
+ - ci/run-build-and-tests: add some structure to the GitHub workflow output
326
+ - ci: make it easier to find failed tests' logs in the GitHub workflow
327
+ - ci/run-build-and-tests: take a more high-level view
328
+ - ci: fix code style
329
+
330
+ Update the GitHub workflow support to make it quicker to get to the
331
+ failing test.
332
+
333
+ Will merge to 'next'?
334
+ cf. <220302.86mti87cj2.gmgdl@evledraar.gmail.com>
335
+ cf. <30dbc8fb-a1db-05bc-3dcb-070e11cf4715@gmail.com>
336
+ source: <pull.1117.v2.git.1646130289.gitgitgadget@gmail.com>
337
+
338
+
339
+* jk/name-rev-w-genno (2022-02-28) 1 commit
340
+ - name-rev: use generation numbers if available
341
+
342
+ "git name-rev" learned to use the generation numbers when setting
343
+ the lower bound of searching commits used to explain the revision,
344
+ when available, instead of committer time.
345
+
346
+ Will merge to 'next'?
347
+ source: <20220228215025.325904-2-jacob.e.keller@intel.com>
348
+
349
+
350
* et/xdiff-indirection (2022-02-17) 1 commit
351
- xdiff: provide indirection to git functions
352
@@ -164,14 +371,15 @@ Release tarballs are available at:
371
372
373
* ab/c99-variadic-macros (2022-02-21) 2 commits
167
- - C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code
168
- - git-compat-util.h: clarify GCC v.s. C99-specific in comment
374
+ (merged to 'next' on 2022-03-01 at 0419a86e23)
375
+ + C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code
376
+ + git-compat-util.h: clarify GCC v.s. C99-specific in comment
377
378
Remove the escape hatch we added when we introduced the weather
379
balloon to use variadic macros unconditionally, to make it official
380
that we now have a hard dependency on the feature.
381
174
- Will merge to 'next'.
382
+ Will merge to 'master'.
383
source: <cover-v4-0.2-00000000000-20220221T160440Z-avarab@gmail.com>
384
385
@@ -242,19 +450,20 @@ Release tarballs are available at:
450
451
452
* ab/help-fixes (2022-02-23) 9 commits
245
- - help: don't print "\n" before single-section output
246
- - help: add --no-[external-commands|aliases] for use with --all
247
- - help: error if [-a|-g|-c] and [-i|-m|-w] are combined
248
- - help: correct usage & behavior of "git help --all"
249
- - help: note the option name on option incompatibility
250
- - help.c: split up list_all_cmds_help() function
251
- - help tests: test "git" and "git help [-a|-g] spacing
252
- - help.c: use puts() instead of printf{,_ln}() for consistency
253
- - help doc: add missing "]" to "[-a|--all]"
453
+ (merged to 'next' on 2022-03-01 at 215f5dbbfb)
454
+ + help: don't print "\n" before single-section output
455
+ + help: add --no-[external-commands|aliases] for use with --all
456
+ + help: error if [-a|-g|-c] and [-i|-m|-w] are combined
457
+ + help: correct usage & behavior of "git help --all"
458
+ + help: note the option name on option incompatibility
459
+ + help.c: split up list_all_cmds_help() function
460
+ + help tests: test "git" and "git help [-a|-g] spacing
461
+ + help.c: use puts() instead of printf{,_ln}() for consistency
462
+ + help doc: add missing "]" to "[-a|--all]"
463
464
Updates to how command line options to "git help" are handled.
465
257
- Will merge to 'next'.
466
+ Will merge to 'master'.
467
source: <cover-v2-0.9-00000000000-20220221T193708Z-avarab@gmail.com>
468
469
@@ -315,23 +524,21 @@ Release tarballs are available at:
524
source: <patch-v2-1.1-777838267a5-20220225T090816Z-avarab@gmail.com>
525
526
318
-* ab/make-optim-noop (2022-02-25) 9 commits
527
+* ab/make-optim-noop (2022-03-03) 8 commits
528
- Makefiles: add and use wildcard "mkdir -p" template
320
- - Makefile: use $(wspfx) for $(QUIET...) in shared.mak
529
- Makefile: add "$(QUIET)" boilerplate to shared.mak
530
- Makefile: move $(comma), $(empty) and $(space) to shared.mak
531
- Makefile: move ".SUFFIXES" rule to shared.mak
532
- Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
533
- Makefile: disable GNU make built-in wildcard rules
534
- Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
327
- - scalar Makefile: set the default target after the includes
535
+ - scalar Makefile: use "The default target of..." pattern
536
537
Makefile refactoring with a bit of suffixes rule stripping to
538
optimize the runtime overhead.
539
332
- Expecting a reroll.
333
- cf. <220226.861qzq7d2r.gmgdl@evledraar.gmail.com>
334
- source: <cover-v3-0.9-00000000000-20220225T090127Z-avarab@gmail.com>
540
+ Will merge to 'next'.
541
+ source: <cover-v5-0.8-00000000000-20220303T160155Z-avarab@gmail.com>
542
543
544
* ah/advice-switch-requires-detach-to-detach (2022-02-25) 1 commit
@@ -345,17 +552,16 @@ Release tarballs are available at:
552
source: <20220226061213.1590341-1-alexhenrie24@gmail.com>
553
554
348
-* ds/commit-graph-gen-v2-fixes (2022-02-28) 4 commits
555
+* ds/commit-graph-gen-v2-fixes (2022-03-01) 5 commits
556
- commit-graph: fix generation number v2 overflow values
557
- commit-graph: start parsing generation v2 (again)
558
- commit-graph: fix ordering bug in generation numbers
559
+ - t5318: extract helpers to lib-commit-graph.sh
560
- test-read-graph: include extra post-parse info
561
562
Fixes to the way generation number v2 in the commit-graph files are
563
(not) handled.
356
-
357
- Will merge to 'next'.
358
- source: <pull.1163.v2.git.1646056423.gitgitgadget@gmail.com>
564
+ source: <pull.1163.v3.git.1646164112.gitgitgadget@gmail.com>
565
566
567
* ds/partial-bundles (2022-02-24) 11 commits
@@ -378,7 +584,7 @@ Release tarballs are available at:
584
source: <pull.1159.git.1645638911.gitgitgadget@gmail.com>
585
586
381
-* fs/gpgsm-update (2022-02-24) 3 commits
587
+* fs/gpgsm-update (2022-03-02) 3 commits
588
- t/lib-gpg: kill all gpg components, not just gpg-agent
589
- t/lib-gpg: reload gpg components after updating trustlist
590
- gpg-interface/gpgsm: fix for v2.3
@@ -388,9 +594,8 @@ Release tarballs are available at:
594
added more processes our tests need to kill when cleaning up.
595
Adjustments have been made to accomodate these changes.
596
391
- Expecting a reroll.
392
- cf. <Yh0NHkyquB7nht3W@pobox.com>
393
- source: <20220203123724.47529-1-fs@gigacodes.de>
597
+ Will merge to 'next'.
598
+ source: <20220224100628.612789-1-fs@gigacodes.de>
599
600
601
* gc/stash-on-branch-with-multi-level-name (2022-02-24) 1 commit
@@ -483,20 +688,21 @@ Release tarballs are available at:
688
source: <pull.985.v2.git.1645811564461.gitgitgadget@gmail.com>
689
690
486
-* vd/sparse-read-tree (2022-02-24) 7 commits
691
+* vd/sparse-read-tree (2022-03-01) 8 commits
692
- read-tree: make three-way merge sparse-aware
693
- read-tree: make two-way merge sparse-aware
694
- read-tree: narrow scope of index expansion for '--prefix'
695
- read-tree: integrate with sparse index
696
- read-tree: expand sparse checkout test coverage
697
+ - read-tree: explicitly disallow prefixes with a leading '/'
698
- status: fix nested sparse directory diff in sparse index
699
- sparse-index: prevent repo root from becoming sparse
700
701
"git read-tree" has been made to be aware of the sparse-index
702
feature.
703
498
- Needs review.
499
- source: <pull.1157.v2.git.1645742073.gitgitgadget@gmail.com>
704
+ Will merge to 'next'.
705
+ source: <pull.1157.v3.git.1646166271.gitgitgadget@gmail.com>
706
707
708
* en/sparse-checkout-fixes (2022-02-20) 5 commits
@@ -537,7 +743,7 @@ Release tarballs are available at:
743
source: <pull.1146.v2.git.1645556015.gitgitgadget@gmail.com>
744
745
540
-* jh/builtin-fsmonitor-part3 (2022-02-16) 25 commits
746
+* jh/builtin-fsmonitor-part3 (2022-03-01) 23 commits
747
- t/perf/p7527: add perf test for builtin FSMonitor
748
- t7527: FSMonitor tests for directory moves
749
- fsmonitor: optimize processing of directory events
@@ -548,7 +754,6 @@ Release tarballs are available at:
754
- fsmonitor--daemon: rename listener thread related variables
755
- fsmonitor--daemon: prepare for adding health thread
756
- fsmonitor--daemon: cd out of worktree root
551
- - fsmonitor--daemon: print start message only if fsmonitor.announceStartup
757
- fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
758
- unpack-trees: initialize fsmonitor_has_run_once in o->result
759
- fsmonitor-settings: remote repos on Windows are incompatible with FSMonitor
@@ -561,28 +766,30 @@ Release tarballs are available at:
766
- t7527: test builtin FSMonitor watching repos with unicode paths
767
- t7527: test FS event reporing on macOS WRT case and Unicode
768
- fsm-listen-win32: handle shortnames
564
- - p7519: leave 1_file directory empty
769
- Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
770
(this branch uses jh/builtin-fsmonitor-part2.)
771
772
More fsmonitor--daemon.
773
+
774
+ Expecting a reroll on the updated "part 2".
775
source: <pull.1143.git.1644940773.gitgitgadget@gmail.com>
776
777
778
* hn/reftable-no-empty-keys (2022-02-23) 7 commits
573
- - reftable: rename writer_stats to reftable_writer_stats
574
- - reftable: add test for length of disambiguating prefix
575
- - reftable: ensure that obj_id_len is >= 2 on writing
576
- - reftable: avoid writing empty keys at the block layer
577
- - reftable: add a test that verifies that writing empty keys fails
578
- - reftable: reject 0 object_id_len
579
- - Documentation: object_id_len goes up to 31
779
+ (merged to 'next' on 2022-03-01 at dc4aa7e796)
780
+ + reftable: rename writer_stats to reftable_writer_stats
781
+ + reftable: add test for length of disambiguating prefix
782
+ + reftable: ensure that obj_id_len is >= 2 on writing
783
+ + reftable: avoid writing empty keys at the block layer
784
+ + reftable: add a test that verifies that writing empty keys fails
785
+ + reftable: reject 0 object_id_len
786
+ + Documentation: object_id_len goes up to 31
787
788
General clean-up in reftable implementation, including
789
clarification of the API documentation, tightening the code to
790
honor documented length limit, etc.
791
585
- Will merge to 'next'?
792
+ Will merge to 'master'.
793
source: <pull.1185.v3.git.git.1645469170.gitgitgadget@gmail.com>
794
795
@@ -595,25 +802,26 @@ Release tarballs are available at:
802
+ fetch: control lifecycle of FETCH_HEAD in a single place
803
+ fetch: backfill tags before setting upstream
804
+ fetch: increase test coverage of fetches
805
+ (this branch is used by ps/fetch-atomic-fixup and ps/fetch-mirror-optim.)
806
807
"git fetch" can make two separate fetches, but ref updates coming
808
from them were in two separate ref transactions under "--atomic",
809
which has been corrected.
810
603
- Will merge to 'master'.
811
source: <cover.1645102965.git.ps@pks.im>
812
813
814
* pw/xdiff-alloc-fail (2022-02-16) 4 commits
608
- - xdiff: handle allocation failure when merging
609
- - xdiff: refactor a function
610
- - xdiff: handle allocation failure in patience diff
611
- - xdiff: fix a memory leak
815
+ (merged to 'next' on 2022-03-01 at 8a10912059)
816
+ + xdiff: handle allocation failure when merging
817
+ + xdiff: refactor a function
818
+ + xdiff: handle allocation failure in patience diff
819
+ + xdiff: fix a memory leak
820
821
Improve failure case behaviour of xdiff library when memory
822
allocation fails.
823
616
- Will merge to 'next'.
824
+ Will merge to 'master'.
825
source: <pull.1140.v2.git.1645006510.gitgitgadget@gmail.com>
826
827
@@ -685,26 +893,27 @@ Release tarballs are available at:
893
894
Implementation of "scalar diagnose" subcommand.
895
688
- Expecting a reroll.
689
- cf. What is the status of this thing?
896
+ On hold.
897
+ cf. <nycvar.QRO.7.76.6.2203012353090.11118@tvgsbejvaqbjf.bet>
898
source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>
899
900
901
* jc/cat-file-batch-commands (2022-02-18) 4 commits
694
- - cat-file: add --batch-command mode
695
- - cat-file: add remove_timestamp helper
696
- - cat-file: introduce batch_mode enum to replace print_contents
697
- - cat-file: rename cmdmode to transform_mode
902
+ (merged to 'next' on 2022-03-01 at 8764b7963c)
903
+ + cat-file: add --batch-command mode
904
+ + cat-file: add remove_timestamp helper
905
+ + cat-file: introduce batch_mode enum to replace print_contents
906
+ + cat-file: rename cmdmode to transform_mode
907
908
"git cat-file" learns "--batch-command" mode, which is a more
909
flexible interface than the existing "--batch" or "--batch-check"
910
modes, to allow different kinds of inquiries made.
911
703
- Will merge to 'next'.
912
+ Will merge to 'master'.
913
source: <pull.1212.v10.git.git.1645208594.gitgitgadget@gmail.com>
914
915
707
-* ar/submodule-update (2022-02-28) 13 commits
916
+* ar/submodule-update (2022-03-02) 13 commits
917
- submodule--helper update-clone: check for --filter and --init
918
- submodule update: add tests for --filter
919
- submodule--helper update-clone: learn --init
@@ -721,7 +930,8 @@ Release tarballs are available at:
930
931
Rewrite of "git submodule update" in C (early part).
932
724
- source: <20220301044132.39474-1-chooglen@google.com>
933
+ cf. <xmqqzgm690iu.fsf@gitster.g>
934
+ source: <20220303005727.69270-1-chooglen@google.com>
935
936
937
* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
@@ -753,7 +963,7 @@ Release tarballs are available at:
963
964
Object-file API shuffling.
965
756
- Needs review.
966
+ Will merge to 'next'.
967
source: <cover-v3-00.12-00000000000-20220204T234435Z-avarab@gmail.com>
968
969
@@ -777,7 +987,8 @@ Release tarballs are available at:
987
histories leading to these two commits were to be merged, and is
988
added as a new mode of "git merge-tree" subcommand.
989
780
- Will merge to 'next'.
990
+ On hold.
991
+ cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
992
source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
993
994
@@ -825,8 +1036,9 @@ Release tarballs are available at:
1036
source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
1037
1038
828
-* en/present-despite-skipped (2022-02-25) 7 commits
829
- - repo_read_index: add config to expect files outside sparse patterns
1039
+* en/present-despite-skipped (2022-03-01) 7 commits
1040
+ (merged to 'next' on 2022-03-01 at 4982287a31)
1041
+ + repo_read_index: add config to expect files outside sparse patterns
1042
(merged to 'next' on 2022-02-15 at 960873fdad)
1043
+ Accelerate clear_skip_worktree_from_present_files() by caching
1044
+ Update documentation related to sparsity and the skip-worktree bit
@@ -840,7 +1052,7 @@ Release tarballs are available at:
1052
harder to correct. Automatically detecting and correcting the marking
1053
of such files has been added to avoid these problems.
1054
843
- Will merge to 'next'?
1055
+ Will merge to 'master'.
1056
source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>
1057
1058
@@ -861,7 +1073,7 @@ Release tarballs are available at:
1073
source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>
1074
1075
864
-* jh/builtin-fsmonitor-part2 (2022-02-11) 30 commits
1076
+* jh/builtin-fsmonitor-part2 (2022-03-01) 30 commits
1077
- update-index: convert fsmonitor warnings to advise
1078
- t7527: test status with untracked-cache and fsmonitor--daemon
1079
- fsmonitor: force update index after large responses
@@ -876,7 +1088,7 @@ Release tarballs are available at:
1088
- help: include fsmonitor--daemon feature flag in version info
1089
- fsmonitor--daemon: implement handle_client callback
1090
- compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
879
- - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent
1091
+ - compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent
1092
- compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
1093
- fsmonitor--daemon: create token-based changed path cache
1094
- fsmonitor--daemon: define token-ids
@@ -896,9 +1108,8 @@ Release tarballs are available at:
1108
1109
Built-in fsmonitor (part 2).
1110
899
- Expecting a (hopefully final) reroll.
900
- cf. <4aa1293e-00b6-b9ef-efd4-cdf605db37a1@jeffhostetler.com>
901
- source: <pull.1041.v5.git.1644612979.gitgitgadget@gmail.com>
1111
+ Will merge to 'next'.
1112
+ source: <pull.1041.v6.git.1646160212.gitgitgadget@gmail.com>
1113
1114
1115
* es/superproject-aware-submodules (2022-02-28) 3 commits
@@ -909,4 +1120,24 @@ Release tarballs are available at:
1120
A configuration variable in a repository tells if it is (or is not)
1121
a submodule of a superproject.
1122
1123
+ Expecting a reroll.
1124
+ cf. <xmqqbkyqupg6.fsf@gitster.g>
1125
source: <20220301002613.1459916-1-emilyshaffer@google.com>
1126
+
1127
+------------------------------------------------------------
1128
+[Discarded]
1129
+
1130
+* jc/parse-options-check (2022-03-01) 1 commit
1131
+ . parse-options: make parse_options_check() test-only
1132
+
1133
+ Bypass sanity checks on the options array at runtime, and trigger
1134
+ them only during the tests.
1135
+ source: <xmqqr17lphav.fsf_-_@gitster.g>
1136
+
1137
+
1138
+* jc/merge-continue-doc (2022-02-28) 1 commit
1139
+ . merge: 'git merge --continue' is merely 'git commit'
1140
+
1141
+ "git merge" documentation clarifies that "git commit" is sufficient
1142
+ to conclude an interrupted merge.
1143
+ source: <xmqq1qzmy55g.fsf@gitster.g>