What's cooking (2022/08 #08)
Junio C Hamano committed
Aug 24, 2022 at 16:59 UTC
2a5d0375cb3118756665f6654c2d2cb37851c31e
1 file changed
+251
-172
whats-cooking.txt
+251
-172
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2022, #07; Fri, 19)
2
+Subject: What's cooking in git.git (Aug 2022, #08; Wed, 24)
3
X-master-at: 795ea8776befc95ea2becd8020c7a284677b4161
4
-X-next-at: 83af4878235c0b991658350560d398d4e8edb8a9
4
+X-next-at: 1cad371f1c4a4d3e2f0d7a9bbce5708e2a9d2902
5
6
-What's cooking in git.git (Aug 2022, #07; Fri, 19)
6
+What's cooking in git.git (Aug 2022, #08; Wed, 24)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,8 +13,8 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
13
considered "accepted" at all. A topic without enough support may be
14
discarded after a long period of no activity.
15
16
-We are at the end of the week #6 of a 12-week cycle (cf.
17
-https://tinyurl.com/gitCal).
16
+We are in the middle of the week #7 of a 12-week cycle
17
+(cf. https://tinyurl.com/gitCal).
18
19
Copies of the source code to Git live in many repositories, and the
20
following is a list of the ones I push into or their mirrors. Some
@@ -47,12 +47,150 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[New Topics]
49
50
+* ds/bundle-uri-3 (2022-08-24) 8 commits
51
+ - bundle-uri: fetch a list of bundles
52
+ - bundle-uri: limit recursion depth for bundle lists
53
+ - bundle-uri: parse bundle list in config format
54
+ - bundle-uri: unit test "key=value" parsing
55
+ - bundle-uri: create "key=value" line parsing
56
+ - bundle-uri: create base key-value pair parsing
57
+ - bundle-uri: create bundle_list struct and helpers
58
+ - Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3
59
+ (this branch uses ds/bundle-uri-clone.)
60
+
61
+ Define the logical elements of a "bundle list", data structure to
62
+ store them in-core, format to transfer them, and code to parse
63
+ them.
64
+
65
+ Needs review.
66
+ source: <pull.1333.git.1661181174.gitgitgadget@gmail.com>
67
+
68
+
69
+* en/merge-unstash-only-on-clean-merge (2022-08-24) 1 commit
70
+ - merge: only apply autostash when appropriate
71
+
72
+ The auto-stashed local changes created by "git merge --autostash"
73
+ was mixed into a conflicted state left in the working tree, which
74
+ has been corrected.
75
+
76
+ Will merge to 'next'.
77
+ source: <610b8d089db97bf1a37dbf230f51ecafe3086254.1661222541.git.gitgitgadget@gmail.com>
78
+
79
+
80
+* es/fix-chained-tests (2022-08-24) 4 commits
81
+ (merged to 'next' on 2022-08-24 at 6266835a6e)
82
+ + t5329: notice a failure within a loop
83
+ (merged to 'next' on 2022-08-22 at 3774cfdaf4)
84
+ + t: detect and signal failure within loop
85
+ + t1092: fix buggy sparse "blame" test
86
+ + t2407: fix broken &&-chains in compound statement
87
+
88
+ Fix broken "&&-" chains and failures in early iterations of a loop.
89
+
90
+ Will merge to 'master'.
91
+ source: <pull.1312.git.git.1661192802.gitgitgadget@gmail.com>
92
+
93
+
94
+* ad/preload-plug-memleak (2022-08-22) 1 commit
95
+ (merged to 'next' on 2022-08-24 at 1cad371f1c)
96
+ + preload-index: fix memleak
97
+
98
+ The preload-index codepath made copies of pathspec to give to
99
+ multiple threads, which were left leaked.
100
+
101
+ Will merge to 'master'.
102
+ source: <20220822211507.8693-2-anthony.2lannoy@gmail.com>
103
+
104
+
105
+* sg/xcalloc-cocci-fix (2022-08-24) 1 commit
106
+ (merged to 'next' on 2022-08-24 at 84c05819d3)
107
+ + promisor-remote: fix xcalloc() argument order
108
+
109
+ xcalloc(), imitating calloc(), takes "number of elements of the
110
+ array", and "size of a single element", in this order. A call that
111
+ does not follow this ordering has been corrected.
112
+
113
+ Will merge to 'master'.
114
+ source: <20220823095733.58685-1-szeder.dev@gmail.com>
115
+
116
+
117
+* ds/github-actions-use-newer-ubuntu (2022-08-24) 1 commit
118
+ (merged to 'next' on 2022-08-24 at 55a76348b2)
119
+ + ci: update 'static-analysis' to Ubuntu 22.04
120
+
121
+ Update the version of Ubuntu used for GitHub Actions CI from 18.04
122
+ to 22.04.
123
+
124
+ Will merge to 'master'.
125
+ source: <pull.1334.git.1661275691795.gitgitgadget@gmail.com>
126
+
127
+
128
+* en/merge-multi-strategies (2022-08-24) 2 commits
129
+ - merge: small code readability improvement
130
+ - merge: cleanup confusing logic for handling successful merges
131
+
132
+ The code that implements multi-strategy support in "git merge" has
133
+ been clean-up a bit.
134
+
135
+ Will merge to 'next'.
136
+ source: <pull.1331.v2.git.1661222541.gitgitgadget@gmail.com>
137
+
138
+
139
+* en/t4301-more-merge-tree-tests (2022-08-24) 1 commit
140
+ - t4301: add more interesting merge-tree testcases
141
+
142
+ More tests to protect the current behaviour of "merge-tree" before
143
+ it gets further updated.
144
+
145
+ Will merge to 'next'.
146
+ source: <pull.1332.git.1661237316150.gitgitgadget@gmail.com>
147
+
148
+
149
+* js/add-p-diff-parsing-fix (2022-08-24) 4 commits
150
+ - add -p: ignore dirty submodules
151
+ - add -p: handle `diff-so-fancy`'s hunk headers better
152
+ - add -p: gracefully ignore unparseable hunk headers in colored diffs
153
+ - t3701: redefine what is "bogus" output of a diff filter
154
+
155
+ Those who use diff-so-fancy as the diff-filter noticed a regression
156
+ or two in the reimplemented "add -p", which has been corrected.
157
+
158
+ Needs review.
159
+ source: <pull.1336.v2.git.1661376112.gitgitgadget@gmail.com>
160
+
161
+
162
+* js/cmake-updates (2022-08-24) 5 commits
163
+ - cmake: increase time-out for a long-running test
164
+ - cmake: avoid editing t/test-lib.sh
165
+ - add -p: avoid ambiguous signed/unsigned comparison
166
+ - cmake: copy the merge tools for testing
167
+ - cmake: make it easier to diagnose regressions in CTest runs
168
+
169
+ Update to build procedure with VS using CMake/CTest.
170
+
171
+ Needs review.
172
+ source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
173
+
174
+
175
+* js/range-diff-with-pathspec (2022-08-24) 2 commits
176
+ - range-diff: optionally accept a pathspec
177
+ - range-diff: reorder argument handling
178
+
179
+ Allow passing a pathspec to "git range-diff".
180
+
181
+ Needs review.
182
+ source: <pull.1335.git.1661258122.gitgitgadget@gmail.com>
183
+
184
+--------------------------------------------------
185
+[Cooking]
186
+
187
* en/ort-unused-code-removal (2022-08-19) 1 commit
51
- - merge-ort: remove code obsoleted by other changes
188
+ (merged to 'next' on 2022-08-22 at f09dbeeca3)
189
+ + merge-ort: remove code obsoleted by other changes
190
191
Code clean-up.
192
55
- Will merge to 'next'?
193
+ Will merge to 'master'.
194
source: <pull.1302.git.git.1660884355643.gitgitgadget@gmail.com>
195
196
@@ -68,63 +206,59 @@ Release tarballs are available at:
206
207
208
* jk/unused-annotation (2022-08-19) 11 commits
71
- - is_path_owned_by_current_uid(): mark "report" parameter as unused
72
- - run-command: mark unused async callback parameters
73
- - mark unused read_tree_recursive() callback parameters
74
- - hashmap: mark unused callback parameters
75
- - config: mark unused callback parameters
76
- - streaming: mark unused virtual method parameters
77
- - transport: mark bundle transport_options as unused
78
- - refs: mark unused virtual method parameters
79
- - refs: mark unused reflog callback parameters
80
- - refs: mark unused each_ref_fn parameters
81
- - git-compat-util: add UNUSED macro
209
+ (merged to 'next' on 2022-08-24 at 2174b8c75d)
210
+ + is_path_owned_by_current_uid(): mark "report" parameter as unused
211
+ + run-command: mark unused async callback parameters
212
+ + mark unused read_tree_recursive() callback parameters
213
+ + hashmap: mark unused callback parameters
214
+ + config: mark unused callback parameters
215
+ + streaming: mark unused virtual method parameters
216
+ + transport: mark bundle transport_options as unused
217
+ + refs: mark unused virtual method parameters
218
+ + refs: mark unused reflog callback parameters
219
+ + refs: mark unused each_ref_fn parameters
220
+ + git-compat-util: add UNUSED macro
221
222
Annotate function parameters that are not used (but cannot be
223
removed for structural reasons), to prepare us to later compile
224
with -Wunused warning turned on.
225
87
- Will merge to 'next'.
226
+ Will merge to 'master'.
227
source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
228
229
91
-* jk/unused-fixes (2022-08-19) 6 commits
92
- - reflog: assert PARSE_OPT_NONEG in parse-options callbacks
93
- - reftable: drop unused parameter from reader_seek_linear()
94
- - verify_one_sparse(): drop unused repository parameter
95
- - match_pathname(): drop unused "flags" parameter
96
- - log-tree: drop unused commit param in remerge_diff()
97
- - xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
230
+* jk/unused-fixes (2022-08-20) 7 commits
231
+ (merged to 'next' on 2022-08-22 at 2fe4de2aed)
232
+ + xdiff: drop unused mmfile parameters from xdl_do_patience_diff()
233
+ + reflog: assert PARSE_OPT_NONEG in parse-options callbacks
234
+ + reftable: drop unused parameter from reader_seek_linear()
235
+ + verify_one_sparse(): drop unused parameters
236
+ + match_pathname(): drop unused "flags" parameter
237
+ + log-tree: drop unused commit param in remerge_diff()
238
+ + xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
239
240
Code clean-up to remove unused function parameters.
241
101
- Will merge to 'next'.
242
+ Will merge to 'master'.
243
source: <Yv9Oay+tNqhLDqVl@coredump.intra.peff.net>
103
-
104
-
105
-* js/merge-tree-without-munging-filenames (2022-08-19) 3 commits
106
- - t4301: add a test case involving a rename, type change & modification
107
- - merge-tree: show the original file names in the conflict output
108
- - merge-tree -z: always show the original file name first
109
-
110
- "git merge-tree" output was improved to help "merging without
111
- working tree" usecase better in a few ways.
112
- source: <pull.1327.git.1660892256.gitgitgadget@gmail.com>
244
+ source: <YwCjOETsh1o8u0Og@coredump.intra.peff.net>
245
246
247
* mg/sequencer-untranslate-reflog (2022-08-19) 3 commits
116
- - sequencer: do not translate command names
117
- - sequencer: do not translate parameters to error_resolve_conflict()
118
- - sequencer: do not translate reflog messages
248
+ (merged to 'next' on 2022-08-22 at 75aadeb865)
249
+ + sequencer: do not translate command names
250
+ + sequencer: do not translate parameters to error_resolve_conflict()
251
+ + sequencer: do not translate reflog messages
252
253
The sequencer machinery translated messages left in the reflog by
254
mistake, which has been corrected.
255
123
- Will merge to 'next'.
256
+ Will merge to 'master'.
257
source: <cover.1660828108.git.git@grubix.eu>
258
259
127
-* tb/midx-with-changing-preferred-pack-fix (2022-08-19) 6 commits
260
+* tb/midx-with-changing-preferred-pack-fix (2022-08-22) 7 commits
261
+ - midx.c: avoid adding preferred objects twice
262
- midx.c: include preferred pack correctly with existing MIDX
263
- midx.c: extract `midx_fanout_add_pack_fanout()`
264
- midx.c: extract `midx_fanout_add_midx_fanout()`
@@ -135,105 +269,21 @@ Release tarballs are available at:
269
Multi-pack index got corrupted when preferred pack changed from one
270
pack to another in a certain way, which has been corrected.
271
138
- Needs review.
139
- source: <cover.1660944574.git.me@ttaylorr.com>
272
+ Will merge to 'next'?
273
+ cf. <be9c7c72-ba24-3e1a-8428-58a2e2afa09a@github.com>
274
+ source: <cover.1661197803.git.me@ttaylorr.com>
275
276
277
* vd/fix-perf-tests (2022-08-19) 2 commits
143
- - p0006: fix 'read-tree' argument ordering
144
- - p0004: fix prereq declaration
278
+ (merged to 'next' on 2022-08-22 at e68356e624)
279
+ + p0006: fix 'read-tree' argument ordering
280
+ + p0004: fix prereq declaration
281
282
Rather trivial perf-test code fixes.
283
148
- Will merge to 'next'.
284
+ Will merge to 'master'.
285
source: <pull.1330.git.1660942149.gitgitgadget@gmail.com>
286
151
---------------------------------------------------
152
-[Graduated to 'master']
153
-
154
-* ds/bundle-uri-more (2022-08-10) 2 commits
155
- (merged to 'next' on 2022-08-12 at 4f445a058d)
156
- + bundle-uri: add example bundle organization
157
- + docs: document bundle URI standard
158
-
159
- The "bundle URI" design gets documented.
160
- source: <pull.1248.v4.git.1660050761.gitgitgadget@gmail.com>
161
-
162
-
163
-* fc/vimdiff-layout-vimdiff3-fix (2022-08-10) 7 commits
164
- (merged to 'next' on 2022-08-11 at a14fec292f)
165
- + mergetools: vimdiff: simplify tabfirst
166
- + mergetools: vimdiff: fix single window layouts
167
- + mergetools: vimdiff: rework tab logic
168
- + mergetools: vimdiff: fix for diffopt
169
- + mergetools: vimdiff: silence annoying messages
170
- + mergetools: vimdiff: make vimdiff3 actually work
171
- + mergetools: vimdiff: fix comment
172
-
173
- "vimdiff3" regression fix.
174
- source: <20220810154618.307275-1-felipe.contreras@gmail.com>
175
-
176
-
177
-* jk/fsck-tree-mode-bits-fix (2022-08-10) 3 commits
178
- (merged to 'next' on 2022-08-11 at 219fe53025)
179
- + fsck: downgrade tree badFilemode to "info"
180
- + fsck: actually detect bad file modes in trees
181
- + tree-walk: add a mechanism for getting non-canonicalized modes
182
-
183
- "git fsck" reads mode from tree objects but canonicalizes the mode
184
- before passing it to the logic to check object sanity, which has
185
- hid broken tree objects from the checking logic. This has been
186
- corrected, but to help exiting projects with broken tree objects
187
- that they cannot fix retroactively, the severity of anomalies this
188
- code detects has been demoted to "info" for now.
189
- source: <YvQcNpizy9uOZiAz@coredump.intra.peff.net>
190
-
191
-
192
-* ll/disk-usage-humanise (2022-08-11) 1 commit
193
- (merged to 'next' on 2022-08-14 at 3873a83f90)
194
- + rev-list: support human-readable output for `--disk-usage`
195
-
196
- "git rev-list --disk-usage" learned to take an optional value
197
- "human" to show the reported value in human-readable format, like
198
- "3.40MiB".
199
- source: <pull.1313.v5.git.1660193274336.gitgitgadget@gmail.com>
200
-
201
-
202
-* po/doc-add-renormalize (2022-08-10) 1 commit
203
- (merged to 'next' on 2022-08-11 at 53851663eb)
204
- + doc add: renormalize is not idempotent for CRCRLF
205
-
206
- Documentation for "git add --renormalize" has been improved.
207
- source: <20220810144450.470-2-philipoakley@iee.email>
208
-
209
-
210
-* sy/sparse-rm (2022-08-08) 5 commits
211
- (merged to 'next' on 2022-08-12 at 5bf10965fb)
212
- + rm: integrate with sparse-index
213
- + rm: expand the index only when necessary
214
- + pathspec.h: move pathspec_needs_expanded_index() from reset.c to here
215
- + t1092: add tests for `git-rm`
216
- + Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rm
217
- (this branch uses vd/sparse-reset-checkout-fixes.)
218
-
219
- "git rm" has become more aware of the sparse-index feature.
220
- source: <20220807041335.1790658-1-shaoxuan.yuan02@gmail.com>
221
-
222
-
223
-* vd/sparse-reset-checkout-fixes (2022-08-08) 4 commits
224
- (merged to 'next' on 2022-08-12 at 755d6ecdb8)
225
- + unpack-trees: unpack new trees as sparse directories
226
- + cache.h: create 'index_name_pos_sparse()'
227
- + oneway_diff: handle removed sparse directories
228
- + checkout: fix nested sparse directory diff in sparse index
229
- (this branch is used by sy/sparse-rm.)
230
-
231
- Fixes to sparse index compatibility work for "reset" and "checkout"
232
- commands.
233
- source: <pull.1312.v3.git.1659985672.gitgitgadget@gmail.com>
234
-
235
---------------------------------------------------
236
-[Cooking]
287
288
* vd/scalar-enables-fsmonitor (2022-08-18) 8 commits
289
(merged to 'next' on 2022-08-19 at 1e172e5647)
@@ -281,8 +331,9 @@ Release tarballs are available at:
331
source: <pull.1325.v3.git.1660806927.gitgitgadget@gmail.com>
332
333
284
-* ed/fsmonitor-on-network-disk (2022-08-18) 2 commits
285
- - fsmonitor: option to allow fsmonitor to run against network-mounted repos
334
+* ed/fsmonitor-on-network-disk (2022-08-24) 3 commits
335
+ - Check working directory and Unix domain socket file for compatability
336
+ - fsmonitor: macOS: allow fsmonitor to run against network-mounted repos
337
(merged to 'next' on 2022-08-14 at 637d458d9c)
338
+ fsmonitor: option to allow fsmonitor to run against network-mounted repos
339
@@ -290,10 +341,9 @@ Release tarballs are available at:
341
repositories; a configuration knob for users to override this has
342
been introduced.
343
293
- The second one needs more work.
294
- cf. <4q6248n0-nqr5-p5pp-64s3-qq7nr53q01op@tzk.qr>
295
- cf. <20220819185847.ulr5yjcfsahydeff@tb-raspi4>
344
+ Needs review.
345
source: <pull.1317.v3.git.1660242752495.gitgitgadget@gmail.com>
346
+ source: <pull.1326.v3.git.1661280941.gitgitgadget@gmail.com>
347
348
349
* jk/is-promisor-object-keep-tree-in-use (2022-08-14) 1 commit
@@ -332,7 +382,8 @@ Release tarballs are available at:
382
option now implies --reapply-cherry-picks and --no-fork-point
383
options.
384
335
- Needs review.
385
+ Expecting a reroll.
386
+ cf. <eab55cef-62bd-af2b-c295-1e76beca032f@gmail.com>
387
source: <pull.1323.git.1660576283.gitgitgadget@gmail.com>
388
389
@@ -353,6 +404,10 @@ Release tarballs are available at:
404
- t6060: modify multiple files to expose a possible issue with merge-index
405
406
An attempt to rewrite remaining merge strategies from shell to C.
407
+
408
+ Needs more work.
409
+ At the minimum, we should lose 11/14 and possibly 08/14.
410
+ cf. <xmqq7d36vfur.fsf@gitster.g>
411
source: <20220809185429.20098-1-alban.gruin@gmail.com>
412
413
@@ -429,46 +484,50 @@ Release tarballs are available at:
484
485
486
* sg/parse-options-subcommand (2022-08-19) 20 commits
432
- - builtin/worktree.c: let parse-options parse subcommands
433
- - builtin/stash.c: let parse-options parse subcommands
434
- - builtin/sparse-checkout.c: let parse-options parse subcommands
435
- - builtin/remote.c: let parse-options parse subcommands
436
- - builtin/reflog.c: let parse-options parse subcommands
437
- - builtin/notes.c: let parse-options parse subcommands
438
- - builtin/multi-pack-index.c: let parse-options parse subcommands
439
- - builtin/hook.c: let parse-options parse subcommands
440
- - builtin/gc.c: let parse-options parse 'git maintenance's subcommands
441
- - builtin/commit-graph.c: let parse-options parse subcommands
442
- - builtin/bundle.c: let parse-options parse subcommands
443
- - parse-options: add support for parsing subcommands
444
- - parse-options: drop leading space from '--git-completion-helper' output
445
- - parse-options: clarify the limitations of PARSE_OPT_NODASH
446
- - parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
447
- - api-parse-options.txt: fix description of OPT_CMDMODE
448
- - t0040-parse-options: test parse_options() with various 'parse_opt_flags'
449
- - t5505-remote.sh: check the behavior without a subcommand
450
- - t3301-notes.sh: check that default operation mode doesn't take arguments
451
- - git.c: update NO_PARSEOPT markings
487
+ (merged to 'next' on 2022-08-22 at 09d07c2271)
488
+ + builtin/worktree.c: let parse-options parse subcommands
489
+ + builtin/stash.c: let parse-options parse subcommands
490
+ + builtin/sparse-checkout.c: let parse-options parse subcommands
491
+ + builtin/remote.c: let parse-options parse subcommands
492
+ + builtin/reflog.c: let parse-options parse subcommands
493
+ + builtin/notes.c: let parse-options parse subcommands
494
+ + builtin/multi-pack-index.c: let parse-options parse subcommands
495
+ + builtin/hook.c: let parse-options parse subcommands
496
+ + builtin/gc.c: let parse-options parse 'git maintenance's subcommands
497
+ + builtin/commit-graph.c: let parse-options parse subcommands
498
+ + builtin/bundle.c: let parse-options parse subcommands
499
+ + parse-options: add support for parsing subcommands
500
+ + parse-options: drop leading space from '--git-completion-helper' output
501
+ + parse-options: clarify the limitations of PARSE_OPT_NODASH
502
+ + parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
503
+ + api-parse-options.txt: fix description of OPT_CMDMODE
504
+ + t0040-parse-options: test parse_options() with various 'parse_opt_flags'
505
+ + t5505-remote.sh: check the behavior without a subcommand
506
+ + t3301-notes.sh: check that default operation mode doesn't take arguments
507
+ + git.c: update NO_PARSEOPT markings
508
509
Introduce the "subcommand" mode to parse-options API and update the
510
command line parser of Git commands with subcommands.
511
456
- Will merge to 'next'?
512
+ Will merge to 'master'.
513
source: <20220819160411.1791200-1-szeder.dev@gmail.com>
514
515
460
-* ds/bundle-uri-clone (2022-08-10) 5 commits
516
+* ds/bundle-uri-clone (2022-08-24) 6 commits
517
+ - clone: warn on failure to repo_init()
518
(merged to 'next' on 2022-08-18 at 5e8a3ec71e)
519
+ clone: --bundle-uri cannot be combined with --depth
520
+ bundle-uri: add support for http(s):// and file://
521
+ clone: add --bundle-uri option
522
+ bundle-uri: create basic file-copy logic
523
+ remote-curl: add 'get' capability
524
+ (this branch is used by ds/bundle-uri-3.)
525
526
Implement "git clone --bundle-uri".
527
528
Will merge to 'master'.
529
source: <pull.1300.v3.git.1660050703.gitgitgadget@gmail.com>
530
+ source: <5229519b-3af2-a023-8996-43343b130722@github.com>
531
532
533
* ds/decorate-filter-tweak (2022-08-05) 11 commits
@@ -500,14 +559,18 @@ Release tarballs are available at:
559
source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
560
561
503
-* ab/submodule-helper-prep (2022-08-03) 28 commits
562
+* ab/submodule-helper-prep (2022-08-22) 32 commits
563
- submodule--helper: fix bad config API usage
564
+ - submodule--helper: libify even more "die" paths for module_update()
565
+ - submodule--helper: libify more "die" paths for module_update()
566
+ - submodule--helper: check repo{_submodule,}_init() return values
567
- submodule--helper: libify "must_die_on_failure" code paths (for die)
568
+ - submodule--helper update: don't override 'checkout' exit code
569
- submodule--helper: libify "must_die_on_failure" code paths
570
- submodule--helper: libify determine_submodule_update_strategy()
571
- submodule--helper: don't exit() on failure, return
572
- submodule--helper: use "code" in run_update_command()
510
- - submodule--helper: move submodule_strategy_to_string() to only user
573
+ - submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string()
574
- submodule--helper: don't call submodule_strategy_to_string() in BUG()
575
- submodule--helper: add missing braces to "else" arm
576
- submodule--helper: return "ret", not "1" from update_submodule()
@@ -515,7 +578,7 @@ Release tarballs are available at:
578
- submodule--helper: don't redundantly check "else if (res)"
579
- submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
580
- submodule--helper: add "const" to copy of "update_data"
518
- - submodule--helper: pass a "const struct module_clone_data" to clone_submodule()
581
+ - submodule--helper: add "const" to passed "module_clone_data"
582
- submodule--helper: move "sb" in clone_submodule() to its own scope
583
- submodule--helper: use xstrfmt() in clone_submodule()
584
- submodule--helper: replace memset() with { 0 }-initialization
@@ -533,9 +596,8 @@ Release tarballs are available at:
596
597
Code clean-up of "git submodule--helper".
598
536
- Expecting a (hopefully final?) reroll.
537
- cf. <220803.86h72tfpcc.gmgdl@evledraar.gmail.com>
538
- source: <cover-v2-00.28-00000000000-20220802T154036Z-avarab@gmail.com>
599
+ Under review.
600
+ source: <cover-v3-00.32-00000000000-20220821T130231Z-avarab@gmail.com>
601
602
603
* ab/dedup-config-and-command-docs (2022-07-29) 9 commits
@@ -590,16 +652,17 @@ Release tarballs are available at:
652
653
654
* tl/trace2-config-scope (2022-08-11) 2 commits
593
- - tr2: shows scope unconditionally in addition to key-value pair
594
- - api-trace2.txt: print config key-value pair
655
+ (merged to 'next' on 2022-08-22 at 75a09c7a34)
656
+ + tr2: shows scope unconditionally in addition to key-value pair
657
+ + api-trace2.txt: print config key-value pair
658
659
Tweak trace2 output about configuration variables.
660
598
- Will merge to 'next'?
661
+ Will merge to 'master'.
662
source: <cover.1660272404.git.dyroneteng@gmail.com>
663
664
602
-* ab/submodule-helper-leakfix (2022-08-03) 18 commits
665
+* ab/submodule-helper-leakfix (2022-08-22) 18 commits
666
- submodule--helper: fix a configure_added_submodule() leak
667
- submodule--helper: free rest of "displaypath" in "struct update_data"
668
- submodule--helper: free some "displaypath" in "struct update_data"
@@ -623,7 +686,7 @@ Release tarballs are available at:
686
Plugging leaks in submodule--helper.
687
688
Waiting for the "prep" step.
626
- source: <cover-v5-00.17-00000000000-20220802T155002Z-avarab@gmail.com>
689
+ source: <cover-v6-00.17-00000000000-20220821T130415Z-avarab@gmail.com>
690
691
692
* cw/submodule-merge-messages (2022-08-04) 1 commit
@@ -661,6 +724,9 @@ Release tarballs are available at:
724
725
The pack bitmap file gained a bitmap-lookup table to speed up
726
locating the necessary bitmap for a given commit.
727
+
728
+ Needs review.
729
+ cf. <YwOXIE8K0GJRLuDT@nand.local>
730
source: <pull.1266.v6.git.1660496112.gitgitgadget@gmail.com>
731
732
@@ -715,3 +781,16 @@ Release tarballs are available at:
781
In stalled state for too long.
782
Also it seems to break t5326 with sha256.
783
source: <20220610195247.1177549-1-jonathantanmy@google.com>
784
+
785
+
786
+* js/merge-tree-without-munging-filenames (2022-08-19) 3 commits
787
+ . t4301: add a test case involving a rename, type change & modification
788
+ . merge-tree: show the original file names in the conflict output
789
+ . merge-tree -z: always show the original file name first
790
+
791
+ "git merge-tree" output was improved to help "merging without
792
+ working tree" usecase better in a few ways.
793
+
794
+ Retracted for now.
795
+ cf. <9p08998o-n88r-2nno-8703-s99o5qpn9o35@tzk.qr>
796
+ source: <pull.1327.git.1660892256.gitgitgadget@gmail.com>