What's cooking (2022/08 #02)
Junio C Hamano committed
Aug 5, 2022 at 16:25 UTC
19667e2de1297b4c586ce4c47d0e07da83ef9ad3
1 file changed
+325
-271
whats-cooking.txt
+325
-271
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2022, #01; Mon, 1)
3
-X-master-at: 350dc9f0e8974b6fcbdeb3808186c5a79c3e7386
4
-X-next-at: 60a89aff129e69125857350fd1eaa291c90d2ab1
2
+Subject: What's cooking in git.git (Aug 2022, #02; Fri, 5)
3
+X-master-at: 679aad9e82d0dfd8ef3d1f98fa4629665496cec9
4
+X-next-at: 8b5581f2bb185e8784b9bfb4e62049927bff10d8
5
6
-What's cooking in git.git (Aug 2022, #01; Mon, 1)
6
+What's cooking in git.git (Aug 2022, #02; Fri, 5)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,8 +13,8 @@ future release). Commits prefixed with '-' are only in 'seen',
13
and aren't considered "accepted" at all.
14
15
A handful of topics have graduated to the 'master' track, and half a
16
-dozen topics are now in 'next' to cook. We are starting Week #4 of
17
-a 12-week cycle.
16
+dozen topics are now in 'next' to cook. We are at the end of Week
17
+#4 of a 12-week cycle (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,65 +47,273 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
50
-* cl/rerere-train-with-no-sign (2022-07-19) 1 commit
51
- (merged to 'next' on 2022-07-20 at fbb9414d09)
52
- + contrib/rerere-train: avoid useless gpg sign in training
50
+* ds/midx-with-less-memory (2022-07-27) 4 commits
51
+ (merged to 'next' on 2022-07-27 at 9ac7aed9f6)
52
+ + write_midx_bitmap(): drop unused refs_snapshot parameter
53
+ (merged to 'next' on 2022-07-20 at 250d257c3e)
54
+ + midx: reduce memory pressure while writing bitmaps
55
+ + midx: extract bitmap write setup
56
+ + pack-bitmap-write: use const for hashes
57
+
58
+ The codepath to write multi-pack index has been taught to release a
59
+ large chunk of memory that holds an array of objects in the packs,
60
+ as soon as it is done with the array, to reduce memory consumption.
61
+ source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
62
+
63
+
64
+* en/merge-restore-to-pristine (2022-07-22) 8 commits
65
+ (merged to 'next' on 2022-07-27 at daafc50c15)
66
+ + merge: do not exit restore_state() prematurely
67
+ + merge: ensure we can actually restore pre-merge state
68
+ + merge: make restore_state() restore staged state too
69
+ + merge: fix save_state() to work when there are stat-dirty files
70
+ + merge: do not abort early if one strategy fails to handle the merge
71
+ + merge: abort if index does not match HEAD for trivial merges
72
+ + merge-resolve: abort if index does not match HEAD
73
+ + merge-ort-wrappers: make printed message match the one from recursive
74
+
75
+ When "git merge" finds that it cannot perform a merge, it should
76
+ restore the working tree to the state before the command was
77
+ initiated, but in some corner cases it didn't.
78
+ source: <pull.1231.v5.git.1658541198.gitgitgadget@gmail.com>
79
+
80
+
81
+* gc/bare-repo-discovery (2022-07-26) 1 commit
82
+ (merged to 'next' on 2022-07-28 at 1d2bef98f6)
83
+ + config.c: NULL check when reading protected config
84
+
85
+ Fix-up for what has been merged to 'master' recently.
86
+ source: <pull.1299.v2.git.git.1658874067077.gitgitgadget@gmail.com>
87
+
88
+
89
+* jc/string-list-cleanup (2022-07-20) 1 commit
90
+ (merged to 'next' on 2022-07-27 at 858a0b2a28)
91
+ + builtin/remote.c: use the right kind of STRING_LIST_INIT
92
+
93
+ Code clean-up.
94
+ source: <xmqq7d471dns.fsf@gitster.g>
95
+
96
+
97
+* jr/gitweb-title-shortening (2022-07-26) 1 commit
98
+ (merged to 'next' on 2022-07-28 at 7528e87220)
99
+ + gitweb: remove title shortening heuristics
100
+
101
+ Gitweb had legacy URL shortener that is specific to the way
102
+ projects hosted on kernel.org used to (but no longer) work, which
103
+ has been removed.
104
+ source: <20220726135911.ycvgwbkixb3ei6w3@jrouhaud>
105
+
106
+
107
+* jt/fetch-pack-trace2-filter-spec (2022-07-26) 1 commit
108
+ (merged to 'next' on 2022-07-28 at 8e6237d6b0)
109
+ + fetch-pack: write effective filter to trace2
110
+
111
+ "git fetch" client logs the partial clone filter used in the trace2
112
+ output.
113
+ source: <20220726162712.1774355-1-jonathantanmy@google.com>
114
+
115
+
116
+* pw/xdiff-alloc (2022-07-08) 4 commits
117
+ (merged to 'next' on 2022-07-25 at 92a39a5ff2)
118
+ + xdiff: introduce XDL_ALLOC_GROW()
119
+ + xdiff: introduce XDL_CALLOC_ARRAY()
120
+ + xdiff: introduce xdl_calloc
121
+ + xdiff: introduce XDL_ALLOC_ARRAY()
122
+
123
+ Add a level of redirection to array allocation API in xdiff part,
124
+ to make it easier to share with the libgit2 project.
125
+ source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
126
+
127
+
128
+* rs/mergesort (2022-07-17) 10 commits
129
+ (merged to 'next' on 2022-07-27 at 42607a44bb)
130
+ + mergesort: remove llist_mergesort()
131
+ + packfile: use DEFINE_LIST_SORT
132
+ + fetch-pack: use DEFINE_LIST_SORT
133
+ + commit: use DEFINE_LIST_SORT
134
+ + blame: use DEFINE_LIST_SORT
135
+ + test-mergesort: use DEFINE_LIST_SORT
136
+ + test-mergesort: use DEFINE_LIST_SORT_DEBUG
137
+ + mergesort: add macros for typed sort of linked lists
138
+ + mergesort: tighten merge loop
139
+ + mergesort: unify ranks loops
140
+
141
+ Make our mergesort implementation type-safe.
142
+ source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
143
+
144
+
145
+* sa/cat-file-mailmap (2022-07-18) 4 commits
146
+ (merged to 'next' on 2022-07-27 at 59c4eb32b3)
147
+ + cat-file: add mailmap support
148
+ + ident: rename commit_rewrite_person() to apply_mailmap_to_header()
149
+ + ident: move commit_rewrite_person() to ident.c
150
+ + revision: improve commit_rewrite_person()
151
+
152
+ "git cat-file" learned an option to use the mailmap when showing
153
+ commit and tag objects.
154
+ source: <20220718195102.66321-1-siddharthasthana31@gmail.com>
155
+
156
+
157
+* tb/cat-file-z (2022-07-22) 2 commits
158
+ (merged to 'next' on 2022-07-28 at 78731f0fdb)
159
+ + builtin/cat-file.c: support NUL-delimited input with `-z`
160
+ + t1006: extract --batch-command inputs to variables
161
+
162
+ Operating modes like "--batch" of "git cat-file" command learned to
163
+ take NUL-terminated input, instead of one-item-per-line.
164
+ source: <cover.1658532524.git.me@ttaylorr.com>
165
+
166
+
167
+* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
168
+ (merged to 'next' on 2022-07-25 at e3464c2c1d)
169
+ + commit-graph: fix corrupt upgrade from generation v1 to v2
170
+ + commit-graph: introduce `repo_find_commit_pos_in_graph()`
171
+ + t5318: demonstrate commit-graph generation v2 corruption
172
+
173
+ There was a bug in the codepath to upgrade generation information
174
+ in commit-graph from v1 to v2 format, which has been corrected.
175
+ source: <cover.1657667404.git.me@ttaylorr.com>
176
+
177
+
178
+* tk/untracked-cache-with-uall (2022-07-22) 1 commit
179
+ (merged to 'next' on 2022-07-25 at b792dd5012)
180
+ + read-cache: make `do_read_index()` always set up `istate->repo`
181
+
182
+ Fix for a bug that makes write-tree to fail to write out a
183
+ non-existent index as a tree, introduced in 2.37.
184
+ source: <20220722212232.833188-1-martin.agren@gmail.com>
185
+
186
+
187
+* zh/ls-files-format (2022-07-23) 1 commit
188
+ (merged to 'next' on 2022-07-27 at b7301f16ce)
189
+ + ls-files: introduce "--format" option
190
+
191
+ "git ls-files" learns the "--format" option to tweak its output.
192
+ source: <pull.1262.v9.git.1658558685407.gitgitgadget@gmail.com>
193
+
194
+--------------------------------------------------
195
+[New Topics]
196
+
197
+* lt/symbolic-ref-sanity (2022-08-01) 1 commit
198
+ (merged to 'next' on 2022-08-03 at 443647b94a)
199
+ + symbolic-ref: refuse to set syntactically invalid target
200
+
201
+ "git symbolic-ref symref non..sen..se" is now diagnosed as an error.
202
+
203
+ Will merge to 'master'.
204
+ source: <YugYNzQYWqDCmOqN@coredump.intra.peff.net>
205
+
206
+
207
+* vd/scalar-generalize-diagnose (2022-08-03) 10 commits
208
+ - scalar: update technical doc roadmap
209
+ - scalar-diagnose: use 'git diagnose --all'
210
+ - builtin/bugreport.c: create '--diagnose' option
211
+ - builtin/diagnose.c: gate certain data behind '--all'
212
+ - builtin/diagnose.c: create 'git diagnose' builtin
213
+ - scalar-diagnose: move functionality to common location
214
+ - scalar-diagnose: move 'get_disk_info()' to 'compat/'
215
+ - scalar-diagnose: add directory to archiver more gently
216
+ - scalar-diagnose: avoid 32-bit overflow of size_t
217
+ - scalar-diagnose: use "$GIT_UNZIP" in test
218
+
219
+ The "diagnose" feature to create a zip archive for diagnostic
220
+ material has been lifted from "scalar" and made into a feature of
221
+ "git bugreport".
222
+ source: <pull.1310.v2.git.1659577543.gitgitgadget@gmail.com>
223
+
224
+
225
+* gc/git-reflog-doc-markup (2022-08-01) 1 commit
226
+ (merged to 'next' on 2022-08-05 at f2d8721ab2)
227
+ + Documentation/git-reflog: remove unneeded \ from \{
228
+
229
+ Doc mark-up fix.
230
+
231
+ Will merge to 'master'.
232
+ source: <pull.1304.git.git.1659387885711.gitgitgadget@gmail.com>
233
+
234
+
235
+* jk/pipe-command-nonblock (2022-08-03) 1 commit
236
+ - pipe_command(): mark stdin descriptor as non-blocking
237
+
238
+ Fix deadlocks between main Git process and subprocess spawned via
239
+ the pipe_command() API, that can kill "git add -p" that was
240
+ reimplemented in C recently.
241
+
242
+ Needs waiting for corresponding change to Windows to put the pipe
243
+ into nonblock mode.
244
+ cf. <YulFTSTbVaTwuQtt@coredump.intra.peff.net>
245
+ source: <YunxHOa2sJeEpJxd@coredump.intra.peff.net>
246
54
- "rerere-train" script (in contrib/) used to honor commit.gpgSign
55
- while recreating the throw-away merges.
56
- source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
247
248
+* ab/plug-revisions-leak (2022-08-03) 6 commits
249
+ (merged to 'next' on 2022-08-05 at d1ca88976f)
250
+ + revisions API: don't leak memory on argv elements that need free()-ing
251
+ + bisect.c: partially fix bisect_rev_setup() memory leak
252
+ + log: refactor "rev.pending" code in cmd_show()
253
+ + log: fix a memory leak in "git show <revision>..."
254
+ + test-fast-rebase helper: use release_revisions() (again)
255
+ + bisect.c: add missing "goto" for release_revisions()
256
59
-* ds/rebase-update-ref (2022-07-19) 13 commits
60
- (merged to 'next' on 2022-07-20 at 9f4bf9ef6c)
61
- + sequencer: notify user of --update-refs activity
62
- + sequencer: ignore HEAD ref under --update-refs
63
- + rebase: add rebase.updateRefs config option
64
- + sequencer: rewrite update-refs as user edits todo list
65
- + rebase: update refs from 'update-ref' commands
66
- + rebase: add --update-refs option
67
- + sequencer: add update-ref command
68
- + sequencer: define array with enum values
69
- + rebase-interactive: update 'merge' description
70
- + branch: consider refs under 'update-refs'
71
- + t2407: test branches currently using apply backend
72
- + t2407: test bisect and rebase as black-boxes
73
- + Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
257
+ Plug a bit more leaks in the revisions API.
258
+
259
+ Will merge to 'master'.
260
+ source: <cover-v3-0.6-00000000000-20220802T152925Z-avarab@gmail.com>
261
+
262
+
263
+* jc/rerere-autoupdate-doc (2022-08-03) 2 commits
264
+ - doc: clarify rerere-autoupdate
265
+ - doc: consolidate --rerere-autoupdate description
266
+
267
+ Update documentation on the "--[no-]rerere-autoupdate" option.
268
+
269
+ Will merge to 'next'.
270
+ source: <xmqq35f2ysd9.fsf@gitster.g>
271
75
- "git rebase -i" learns to update branches whose tip appear in the
76
- rebased range with "--update-refs" option.
77
- source: <pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>
272
273
+* es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits
274
+ - config: let feature.experimental imply gc.cruftPacks=true
275
+ - gc: add tests for --cruft and friends
276
80
-* kk/p4-client-name-encoding-fix (2022-07-21) 2 commits
81
- (merged to 'next' on 2022-07-21 at 008518b4e5)
82
- + git-p4: refactoring of p4CmdList()
83
- (merged to 'next' on 2022-07-11 at 9c18616f76)
84
- + git-p4: fix bug with encoding of p4 client name
277
+ Enable gc.cruftpacks by default for those who opt into
278
+ feature.experimental setting.
279
86
- "git p4" did not handle non-ASCII client name well, which has been
87
- corrected.
88
- source: <pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com>
280
+ Expecting a reroll.
281
+ cf. <220804.86a68ke9d5.gmgdl@evledraar.gmail.com>
282
+ cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@github.com>
283
+ source: <20220803205721.3686361-1-emilyshaffer@google.com>
284
+
285
+
286
+* pw/use-glibc-tunable-for-malloc-optim (2022-08-04) 1 commit
287
+ - tests: cache glibc version check
288
+
289
+ Avoid repeatedly running getconf to ask libc version in the test
290
+ suite, and instead just as it once per script.
291
+
292
+ Will merge to 'next'?
293
+ source: <pull.1311.git.1659620305757.gitgitgadget@gmail.com>
294
295
91
-* mt/checkout-count-fix (2022-07-14) 3 commits
92
- (merged to 'next' on 2022-07-22 at 60c73a6b0b)
93
- + checkout: fix two bugs on the final count of updated entries
94
- + checkout: show bug about failed entries being included in final report
95
- + checkout: document bug where delayed checkout counts entries twice
96
- (this branch is used by mt/rot13-in-c.)
296
+* vd/sparse-reset-checkout-fixes (2022-08-04) 4 commits
297
+ - unpack-trees: handle missing sparse directories
298
+ - cache.h: replace 'index_entry_exists()' with 'index_name_pos_sparse()'
299
+ - oneway_diff: handle removed sparse directories
300
+ - checkout: fix nested sparse directory diff in sparse index
301
98
- "git checkout" miscounted the paths it updated, which has been
99
- corrected.
100
- source: <cover.1657799213.git.matheus.bernardino@usp.br>
302
+ Fixes to sparse index compatibility work for "reset" and "checkout"
303
+ commands.
304
305
+ Expecting a reroll to further clarify [4/4].
306
+ cf. <3825ef9a-4c71-21ed-6452-bbd322ca839c@github.com>
307
+ source: <pull.1312.git.1659645967.gitgitgadget@gmail.com>
308
103
-* mt/pkt-line-comment-tweak (2022-07-22) 1 commit
104
- (merged to 'next' on 2022-07-22 at 4004fa75eb)
105
- + pkt-line.h: move comment closer to the associated code
309
107
- In-code comment clarification.
108
- source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>
310
+* ab/hooks-regression-fix (2022-08-05) 1 commit
311
+ - hook API: don't segfault on strbuf_addf() to NULL "out"
312
+
313
+ A follow-up fix to a fix for a regression in 2.36.
314
+
315
+ Will merge to 'next' and then to 'master'.
316
+ source: <patch-1.1-2450e3e65cf-20220805T141402Z-avarab@gmail.com>
317
318
--------------------------------------------------
319
[Stalled]
@@ -138,31 +346,24 @@ Release tarballs are available at:
346
--------------------------------------------------
347
[Cooking]
348
141
-* tb/cat-file-z (2022-07-22) 2 commits
142
- (merged to 'next' on 2022-07-28 at 78731f0fdb)
143
- + builtin/cat-file.c: support NUL-delimited input with `-z`
144
- + t1006: extract --batch-command inputs to variables
145
-
146
- Operating modes like "--batch" of "git cat-file" command learned to
147
- take NUL-terminated input, instead of one-item-per-line.
148
-
149
- Will merge to 'master'.
150
- source: <cover.1658532524.git.me@ttaylorr.com>
151
-
152
-
153
-* ab/tech-docs-to-help (2022-07-23) 9 commits
154
- - docs: move multi-pack-index docs to man section 5
349
+* ab/tech-docs-to-help (2022-08-04) 12 commits
350
- docs: move http-protocol docs to man section 5
351
+ - docs: move cruft pack docs to gitformat-pack
352
- docs: move pack format docs to man section 5
353
+ - docs: move signature docs to man section 5
354
+ - docs: move index format docs to man section 5
355
- docs: move protocol-related docs to man section 5
356
- docs: move commit-graph format docs to man section 5
357
- git docs: add a category for file formats, protocols and interfaces
358
- git docs: add a category for user-facing file, repo and command UX
359
- git help doc: use "<doc>" instead of "<guide>"
162
- - help.c: BUG() out if "help --guides" can't remove "git" prefixes
360
+ - help.c: remove common category behavior from drop_prefix() behavior
361
+ - help.c: refactor drop_prefix() to use a "switch" statement"
362
363
Expose a lot of "tech docs" via "git help" interface.
165
- source: <cover-v5-0.9-00000000000-20220721T160721Z-avarab@gmail.com>
364
+
365
+ Will merge to 'next'?
366
+ source: <cover-v8-00.12-00000000000-20220804T162138Z-avarab@gmail.com>
367
368
369
* sg/parse-options-subcommand (2022-07-25) 20 commits
@@ -192,7 +393,7 @@ Release tarballs are available at:
393
source: <20220725123857.2773963-1-szeder.dev@gmail.com>
394
395
195
-* ds/bundle-uri-clone (2022-07-25) 5 commits
396
+* ds/bundle-uri-clone (2022-08-02) 5 commits
397
- clone: --bundle-uri cannot be combined with --depth
398
- bundle-uri: add support for http(s):// and file://
399
- clone: add --bundle-uri option
@@ -200,7 +401,7 @@ Release tarballs are available at:
401
- remote-curl: add 'get' capability
402
403
Implement "git clone --bundle-uri".
203
- source: <pull.1300.git.1658781277.gitgitgadget@gmail.com>
404
+ source: <pull.1300.v2.git.1659443384.gitgitgadget@gmail.com>
405
406
407
* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit
@@ -214,43 +415,22 @@ Release tarballs are available at:
415
source: <pull.1304.git.1658912756815.gitgitgadget@gmail.com>
416
417
217
-* ds/decorate-filter-tweak (2022-07-29) 10 commits
418
+* ds/decorate-filter-tweak (2022-08-05) 11 commits
419
- fetch: use ref_namespaces during prefetch
420
- maintenance: stop writing log.excludeDecoration
220
- - log: create log.decorateFilter=all
221
- - log: add --decorate-all option
421
+ - log: create log.initialDecorationSet=all
422
+ - log: add --clear-decorations option
423
- log: add default decoration filter
424
- log-tree: use ref_namespaces instead of if/else-if
425
- refs: use ref_namespaces for replace refs base
426
- refs: add array of ref namespaces
427
- t4207: test coloring of grafted decorations
428
+ - t4207: modernize test
429
- refs: allow "HEAD" as decoration filter
430
431
The namespaces used by "log --decorate" from "refs/" hierarchy by
432
default has been tightened.
231
- source: <pull.1301.v2.git.1659122979.gitgitgadget@gmail.com>
232
-
233
-
234
-* gc/bare-repo-discovery (2022-07-26) 1 commit
235
- (merged to 'next' on 2022-07-28 at 1d2bef98f6)
236
- + config.c: NULL check when reading protected config
237
-
238
- Fix-up for what has been merged to 'master' recently.
239
-
240
- Will merge to 'master'.
241
- source: <pull.1299.v2.git.git.1658874067077.gitgitgadget@gmail.com>
242
-
243
-
244
-* jr/gitweb-title-shortening (2022-07-26) 1 commit
245
- (merged to 'next' on 2022-07-28 at 7528e87220)
246
- + gitweb: remove title shortening heuristics
247
-
248
- Gitweb had legacy URL shortener that is specific to the way
249
- projects hosted on kernel.org used to (but no longer) work, which
250
- has been removed.
251
-
252
- Will merge to 'master'.
253
- source: <20220726135911.ycvgwbkixb3ei6w3@jrouhaud>
433
+ source: <pull.1301.v3.git.1659722323.gitgitgadget@gmail.com>
434
435
436
* es/doc-creation-factor-fix (2022-07-28) 2 commits
@@ -283,16 +463,24 @@ Release tarballs are available at:
463
source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>
464
465
286
-* ab/submodule-helper-prep (2022-07-28) 20 commits
466
+* ab/submodule-helper-prep (2022-08-03) 28 commits
467
- submodule--helper: fix bad config API usage
468
+ - submodule--helper: libify "must_die_on_failure" code paths (for die)
469
+ - submodule--helper: libify "must_die_on_failure" code paths
470
+ - submodule--helper: libify determine_submodule_update_strategy()
471
- submodule--helper: don't exit() on failure, return
289
- - submodule--helper: add skeleton "goto cleanup" to update_submodule()
472
+ - submodule--helper: use "code" in run_update_command()
473
+ - submodule--helper: move submodule_strategy_to_string() to only user
474
+ - submodule--helper: don't call submodule_strategy_to_string() in BUG()
475
+ - submodule--helper: add missing braces to "else" arm
476
+ - submodule--helper: return "ret", not "1" from update_submodule()
477
- submodule--helper: rename "int res" to "int ret"
478
+ - submodule--helper: don't redundantly check "else if (res)"
479
- submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
480
- submodule--helper: add "const" to copy of "update_data"
481
- submodule--helper: pass a "const struct module_clone_data" to clone_submodule()
294
- - submodule--helper: stop conflating "sb" in clone_submodule()
295
- - submodule--helper: convert a strbuf_detach() to xstrfmt()
482
+ - submodule--helper: move "sb" in clone_submodule() to its own scope
483
+ - submodule--helper: use xstrfmt() in clone_submodule()
484
- submodule--helper: replace memset() with { 0 }-initialization
485
- submodule--helper style: add \n\n after variable declarations
486
- submodule--helper style: don't separate declared variables with \n\n
@@ -306,7 +494,7 @@ Release tarballs are available at:
494
- submodule tests: test usage behavior
495
(this branch is used by ab/submodule-helper-leakfix.)
496
309
- source: <cover-00.20-00000000000-20220728T161116Z-avarab@gmail.com>
497
+ source: <cover-v2-00.28-00000000000-20220802T154036Z-avarab@gmail.com>
498
499
500
* ab/dedup-config-and-command-docs (2022-07-29) 9 commits
@@ -323,7 +511,10 @@ Release tarballs are available at:
511
Share the text used to explain configuration variables used by "git
512
<subcmd>" in "git help <subcmd>" with the text from "git help config".
513
326
- Will merge to 'next'?
514
+ Expecting a reroll.
515
+ cf. <CAHd-oW5mD-H1kvuF9VEVb8KjaSkUSUpBH-WAkpCn6_Ci8o888w@mail.gmail.com>
516
+ cf. <CAHd-oW7s6Hu24uTjCW9ROBbJkA5+7TCu32a4L_BXVLhcvw5kSw@mail.gmail.com>
517
+ cf. <xmqqlesb4lwh.fsf@gitster.g>
518
source: <cover-v2-0.9-00000000000-20220729T081959Z-avarab@gmail.com>
519
520
@@ -377,36 +568,27 @@ Release tarballs are available at:
568
569
570
* ab/leak-check (2022-07-27) 15 commits
380
- - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks
381
- - upload-pack: fix a memory leak in create_pack_file()
382
- - leak tests: mark passing SANITIZE=leak tests as leak-free
383
- - leak tests: don't skip some tests under SANITIZE=leak
384
- - test-lib: have the "check" mode for SANITIZE=leak consider leak logs
385
- - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode
386
- - test-lib: simplify by removing test_external
387
- - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh
388
- - t/Makefile: don't remove test-results in "clean-except-prove-cache"
389
- - test-lib: add a SANITIZE=leak logging mode
390
- - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description
391
- - test-lib: add a --invert-exit-code switch
392
- - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT
393
- - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
394
- - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
571
+ (merged to 'next' on 2022-08-05 at 2a6b9c8432)
572
+ + CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks
573
+ + upload-pack: fix a memory leak in create_pack_file()
574
+ + leak tests: mark passing SANITIZE=leak tests as leak-free
575
+ + leak tests: don't skip some tests under SANITIZE=leak
576
+ + test-lib: have the "check" mode for SANITIZE=leak consider leak logs
577
+ + test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode
578
+ + test-lib: simplify by removing test_external
579
+ + tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh
580
+ + t/Makefile: don't remove test-results in "clean-except-prove-cache"
581
+ + test-lib: add a SANITIZE=leak logging mode
582
+ + t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description
583
+ + test-lib: add a --invert-exit-code switch
584
+ + test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT
585
+ + test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
586
+ + test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
587
588
Extend SANITIZE=leak checking and declare more tests "currently leak-free".
589
398
- Will merge to 'next'?
399
- source: <cover-v3-00.15-00000000000-20220727T230800Z-avarab@gmail.com>
400
-
401
-
402
-* jc/string-list-cleanup (2022-07-20) 1 commit
403
- (merged to 'next' on 2022-07-27 at 858a0b2a28)
404
- + builtin/remote.c: use the right kind of STRING_LIST_INIT
405
-
406
- Code clean-up.
407
-
590
Will merge to 'master'.
409
- source: <xmqq7d471dns.fsf@gitster.g>
591
+ source: <cover-v3-00.15-00000000000-20220727T230800Z-avarab@gmail.com>
592
593
594
* mt/rot13-in-c (2022-07-31) 4 commits
@@ -419,45 +601,18 @@ Release tarballs are available at:
601
source: <cover.1659291025.git.matheus.bernardino@usp.br>
602
603
422
-* tk/untracked-cache-with-uall (2022-07-22) 1 commit
423
- (merged to 'next' on 2022-07-25 at b792dd5012)
424
- + read-cache: make `do_read_index()` always set up `istate->repo`
425
-
426
- Fix for a bug that makes write-tree to fail to write out a
427
- non-existent index as a tree, introduced in 2.37.
428
-
429
- Will merge to 'master'.
430
- source: <20220722212232.833188-1-martin.agren@gmail.com>
431
-
432
-
433
-* ds/midx-with-less-memory (2022-07-27) 4 commits
434
- (merged to 'next' on 2022-07-27 at 9ac7aed9f6)
435
- + write_midx_bitmap(): drop unused refs_snapshot parameter
436
- (merged to 'next' on 2022-07-20 at 250d257c3e)
437
- + midx: reduce memory pressure while writing bitmaps
438
- + midx: extract bitmap write setup
439
- + pack-bitmap-write: use const for hashes
440
-
441
- The codepath to write multi-pack index has been taught to release a
442
- large chunk of memory that holds an array of objects in the packs,
443
- as soon as it is done with the array, to reduce memory consumption.
444
-
445
- Will merge to 'master'.
446
- source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
447
-
448
-
604
* tl/trace2-config-scope (2022-07-22) 2 commits
605
- tr2: shows scope unconditionally in addition to key-value pair
606
- api-trace2.txt: print config key-value pair
607
608
Tweak trace2 output about configuration variables.
609
455
- Expecting a reroll.
456
- cf. <220722.86fsits91m.gmgdl@evledraar.gmail.com>
610
+ Needs reviewer response
611
+ cf. <20220801122515.23146-1-tenglong.tl@alibaba-inc.com>
612
source: <cover.1658472474.git.dyroneteng@gmail.com>
613
614
460
-* ab/submodule-helper-leakfix (2022-07-28) 18 commits
615
+* ab/submodule-helper-leakfix (2022-08-03) 18 commits
616
- submodule--helper: fix a configure_added_submodule() leak
617
- submodule--helper: free rest of "displaypath" in "struct update_data"
618
- submodule--helper: free some "displaypath" in "struct update_data"
@@ -481,69 +636,17 @@ Release tarballs are available at:
636
Plugging leaks in submodule--helper.
637
638
Getting there.
484
- source: <cover-v4-00.17-00000000000-20220728T162442Z-avarab@gmail.com>
639
+ source: <cover-v5-00.17-00000000000-20220802T155002Z-avarab@gmail.com>
640
641
487
-* jt/fetch-pack-trace2-filter-spec (2022-07-26) 1 commit
488
- (merged to 'next' on 2022-07-28 at 8e6237d6b0)
489
- + fetch-pack: write effective filter to trace2
490
-
491
- "git fetch" client logs the partial clone filter used in the trace2
492
- output.
493
-
494
- Will merge to 'master'.
495
- source: <20220726162712.1774355-1-jonathantanmy@google.com>
496
-
497
-
498
-* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
499
- - cherry-pick doc: clarify no-rerere-autoupdate still allows rerere
500
-
501
- Clarifies that the "--no-rerere-autoupdate" option does not disable
502
- the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
503
-
504
- Needs updating, at least for other commands with the same option.
505
- cf. <xmqq35f2ysd9.fsf@gitster.g>
506
- source: <20220715092527.1567837-1-mail@beyermatthias.de>
507
-
508
-
509
-* rs/mergesort (2022-07-17) 10 commits
510
- (merged to 'next' on 2022-07-27 at 42607a44bb)
511
- + mergesort: remove llist_mergesort()
512
- + packfile: use DEFINE_LIST_SORT
513
- + fetch-pack: use DEFINE_LIST_SORT
514
- + commit: use DEFINE_LIST_SORT
515
- + blame: use DEFINE_LIST_SORT
516
- + test-mergesort: use DEFINE_LIST_SORT
517
- + test-mergesort: use DEFINE_LIST_SORT_DEBUG
518
- + mergesort: add macros for typed sort of linked lists
519
- + mergesort: tighten merge loop
520
- + mergesort: unify ranks loops
521
-
522
- Make our mergesort implementation type-safe.
523
-
524
- Will merge to 'master'.
525
- source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
526
-
527
-
528
-* cw/submodule-merge-messages (2022-07-28) 1 commit
642
+* cw/submodule-merge-messages (2022-08-04) 1 commit
643
- submodule merge: update conflict error message
644
645
Update the message given when "git merge" sees conflicts at a path
646
with a submodule while merging a superproject.
533
- source: <20220728211221.2913928-1-calvinwan@google.com>
534
-
535
-
536
-* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
537
- (merged to 'next' on 2022-07-25 at e3464c2c1d)
538
- + commit-graph: fix corrupt upgrade from generation v1 to v2
539
- + commit-graph: introduce `repo_find_commit_pos_in_graph()`
540
- + t5318: demonstrate commit-graph generation v2 corruption
541
-
542
- There was a bug in the codepath to upgrade generation information
543
- in commit-graph from v1 to v2 format, which has been corrected.
647
545
- Will merge to 'master'.
546
- source: <cover.1657667404.git.me@ttaylorr.com>
648
+ Getting closer?
649
+ source: <20220804195105.1303455-1-calvinwan@google.com>
650
651
652
* js/safe-directory-plus (2022-07-13) 3 commits
@@ -595,63 +698,6 @@ Release tarballs are available at:
698
source: <pull.1266.v5.git.1658342304.gitgitgadget@gmail.com>
699
700
598
-* sa/cat-file-mailmap (2022-07-18) 4 commits
599
- (merged to 'next' on 2022-07-27 at 59c4eb32b3)
600
- + cat-file: add mailmap support
601
- + ident: rename commit_rewrite_person() to apply_mailmap_to_header()
602
- + ident: move commit_rewrite_person() to ident.c
603
- + revision: improve commit_rewrite_person()
604
-
605
- "git cat-file" learned an option to use the mailmap when showing
606
- commit and tag objects.
607
-
608
- Will merge to 'master'.
609
- source: <20220718195102.66321-1-siddharthasthana31@gmail.com>
610
-
611
-
612
-* pw/xdiff-alloc (2022-07-08) 4 commits
613
- (merged to 'next' on 2022-07-25 at 92a39a5ff2)
614
- + xdiff: introduce XDL_ALLOC_GROW()
615
- + xdiff: introduce XDL_CALLOC_ARRAY()
616
- + xdiff: introduce xdl_calloc
617
- + xdiff: introduce XDL_ALLOC_ARRAY()
618
-
619
- Add a level of redirection to array allocation API in xdiff part,
620
- to make it easier to share with the libgit2 project.
621
-
622
- Will merge to 'master'.
623
- source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
624
-
625
-
626
-* en/merge-restore-to-pristine (2022-07-22) 8 commits
627
- (merged to 'next' on 2022-07-27 at daafc50c15)
628
- + merge: do not exit restore_state() prematurely
629
- + merge: ensure we can actually restore pre-merge state
630
- + merge: make restore_state() restore staged state too
631
- + merge: fix save_state() to work when there are stat-dirty files
632
- + merge: do not abort early if one strategy fails to handle the merge
633
- + merge: abort if index does not match HEAD for trivial merges
634
- + merge-resolve: abort if index does not match HEAD
635
- + merge-ort-wrappers: make printed message match the one from recursive
636
-
637
- When "git merge" finds that it cannot perform a merge, it should
638
- restore the working tree to the state before the command was
639
- initiated, but in some corner cases it didn't.
640
-
641
- Will merge to 'master'.
642
- source: <pull.1231.v5.git.1658541198.gitgitgadget@gmail.com>
643
-
644
-
645
-* zh/ls-files-format (2022-07-23) 1 commit
646
- (merged to 'next' on 2022-07-27 at b7301f16ce)
647
- + ls-files: introduce "--format" option
648
-
649
- "git ls-files" learns the "--format" option to tweak its output.
650
-
651
- Will merge to 'master'.
652
- source: <pull.1262.v9.git.1658558685407.gitgitgadget@gmail.com>
653
-
654
-
701
* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
702
- fetch,fetch-pack: clarify connectivity check error
703
@@ -739,3 +785,11 @@ Release tarballs are available at:
785
Retracted.
786
cf. <20220723134834.9693-1-matheus.bernardino@usp.br>
787
source: <cover.1657819649.git.matheus.bernardino@usp.br>
788
+
789
+
790
+* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
791
+ . cherry-pick doc: clarify no-rerere-autoupdate still allows rerere
792
+
793
+ Clarifies that the "--no-rerere-autoupdate" option does not disable
794
+ the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
795
+ source: <20220715092527.1567837-1-mail@beyermatthias.de>