What's cooking (2023/07 #03)
Junio C Hamano committed
Jul 13, 2023 at 14:38 UTC
ed602ca33855969605552218de3a2f77e87f11f3
1 file changed
+236
-308
whats-cooking.txt
+236
-308
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2023, #02; Mon, 10)
2
+Subject: What's cooking in git.git (Jul 2023, #03; Thu, 13)
3
X-master-at: aa9166bcc0ba654fc21f198a30647ec087f733ed
4
-X-next-at: 4146f391ed560245855fc20b1ea1851409e7b4c8
4
+X-next-at: 6d72f3e9957d90c2c3269bbf808b5f7ffda9b026
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2023, #02; Mon, 10)
7
+What's cooking in git.git (Jul 2023, #03; Thu, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,10 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
+There are quite a few topics that have been in "Expecting a reroll"
21
+for too long. I've moved those that are more than 3 months old to
22
+the "Will discard" section.
23
+
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
26
repositories have only a subset of branches.
@@ -48,263 +52,68 @@ Release tarballs are available at:
52
--------------------------------------------------
53
[New Topics]
54
51
-* ah/advise-force-pushing (2023-07-07) 1 commit
52
- - push: advise about force-pushing as an alternative to reconciliation
53
-
54
- Help newbies by suggesting that there are cases where force-pushing
55
- is a valid and sensible thing to update a branch at a remote
56
- repository, rather than reconciling with merge/rebase.
57
-
58
- Will merge to 'next'?
59
- Perhaps we should go ahead with only the "git push" half (queued here)
60
- without touching "git checkout" and "git status" half (not queued here).
61
- source: <20230707054257.3366355-3-alexhenrie24@gmail.com>
62
-
63
-
64
-* jc/pathspec-match-with-common-prefix (2023-07-08) 2 commits
65
- (merged to 'next' on 2023-07-10 at 4146f391ed)
66
- + dir: match "attr" pathspec magic with correct paths
67
- + t6135: attr magic with path pattern
68
-
69
- "git ls-files '(attr:X)D/'" that triggers the common prefix
70
- optimization codepath failed to read from "D/.gitattributes",
71
- which has been corrected.
72
-
73
- Will merge to 'master'.
74
- source: <20230707220457.3655121-1-gitster@pobox.com>
75
-
76
-
77
-* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
78
- - tree-walk: drop unused base_offset from do_match()
79
- - tree-walk: lose base_offset that is never used in tree_entry_interesting
80
-
81
- Code simplification.
82
-
83
- Needs review.
84
- source: <20230707222116.4129415-1-gitster@pobox.com>
85
-
86
-
87
-* rs/ls-tree-prefix-simplify (2023-07-07) 1 commit
88
- (merged to 'next' on 2023-07-08 at 3e4826525f)
89
- + ls-tree: simplify prefix handling
90
-
91
- Code simplification.
92
-
93
- Will merge to 'master'.
94
- source: <b34aa99b-2bf1-c645-bdf5-03ac258b4bf5@web.de>
95
-
96
-
97
-* rs/pretty-format-double-negation-fix (2023-07-07) 1 commit
98
- (merged to 'next' on 2023-07-08 at 6674b562ff)
99
- + pretty: avoid double negative in format_commit_item()
100
-
101
- Code clarification.
102
-
103
- Will merge to 'master'.
104
- source: <8d4fcad1-5f71-4790-17ee-e9ba0a3118dc@web.de>
105
-
106
-
107
-* rs/userformat-find-requirements-simplify (2023-07-07) 1 commit
108
- (merged to 'next' on 2023-07-08 at 6cdc328a08)
109
- + pretty: use strchr(3) in userformat_find_requirements()
110
-
111
- Code simplification.
112
-
113
- Will merge to 'master'.
114
- source: <108ab1a2-28f4-dd62-1f90-64f37708aa8c@web.de>
115
-
116
-
117
-* mh/doc-credential-helpers (2023-07-10) 1 commit
118
- - doc: gitcredentials: link to helper list
119
-
120
- Doc update.
121
-
122
- Will merge to 'next'.
123
- source: <pull.1538.v3.git.1688848614262.gitgitgadget@gmail.com>
124
-
125
-
126
-* tb/fsck-no-progress (2023-07-10) 6 commits
127
- - commit-graph.c: avoid duplicated progress output during `verify`
128
- - commit-graph.c: pass progress to `verify_one_commit_graph()`
129
- - commit-graph.c: iteratively verify commit-graph chains
130
- - commit-graph.c: extract `verify_one_commit_graph()`
131
- - fsck: suppress MIDX output with `--no-progress`
132
- - fsck: suppress commit-graph output with `--no-progress`
133
-
134
- "git fsck --no-progress" still spewed noise from the commit-graph
135
- subsystem, which has been corrected.
136
-
137
- Will merge to 'next'.
138
- source: <cover.1688776280.git.me@ttaylorr.com>
139
-
140
-
141
-* tb/repack-cleanup (2023-07-10) 2 commits
142
- - builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
143
- - builtin/repack.c: only repack `.pack`s that exist
144
-
145
- The recent change to "git repack" made it react less nicely when a
146
- leftover .idx file that no longer has the corresponding .pack file
147
- in the repository, which has been corrected.
148
-
149
- Will merge to 'next'.
150
- source: <cover.1689017830.git.me@ttaylorr.com>
151
-
152
---------------------------------------------------
153
-[Graduated to 'master']
154
-
155
-* cw/strbuf-cleanup (2023-06-12) 7 commits
156
- (merged to 'next' on 2023-06-28 at c158b004a8)
157
- + strbuf: remove global variable
158
- + path: move related function to path
159
- + object-name: move related functions to object-name
160
- + credential-store: move related functions to credential-store file
161
- + abspath: move related functions to abspath
162
- + strbuf: clarify dependency
163
- + strbuf: clarify API boundary
164
-
165
- Move functions that are not about pure string manipulation out of
166
- strbuf.[ch]
167
- source: <20230606194720.2053551-1-calvinwan@google.com>
168
-
169
-
170
-* gc/config-context (2023-06-28) 11 commits
171
- (merged to 'next' on 2023-06-28 at 38632f3daf)
172
- + config: pass source to config_parser_event_fn_t
173
- + config: add kvi.path, use it to evaluate includes
174
- + config.c: remove config_reader from configsets
175
- + config: pass kvi to die_bad_number()
176
- + trace2: plumb config kvi
177
- + config.c: pass ctx with CLI config
178
- + config: pass ctx with config files
179
- + config.c: pass ctx in configsets
180
- + config: add ctx arg to config_fn_t
181
- + urlmatch.h: use config_fn_t type
182
- + config: inline git_color_default_config
183
-
184
- Reduce reliance on a global state in the config reading API.
185
- source: <pull.1497.v5.git.git.1687980390.gitgitgadget@gmail.com>
186
-
187
-
188
-* gc/config-partial-submodule-kvi-fix (2023-06-26) 1 commit
189
- (merged to 'next' on 2023-06-28 at 1fb30a34e3)
190
- + config: don't BUG when both kvi and source are set
191
-
192
- Partially revert a sanity check that the rest of the config code
193
- was not ready, to avoid triggering it in a corner case.
194
- source: <pull.1535.git.git.1687801297404.gitgitgadget@gmail.com>
195
-
196
-
197
-* jc/doc-hash-object-types (2023-06-28) 1 commit
198
- (merged to 'next' on 2023-06-28 at adff1700c2)
199
- + docs: add git hash-object -t option's possible values
200
-
201
- Doc update.
202
- source: <pull.1533.v3.git.git.1688004473941.gitgitgadget@gmail.com>
55
+* ah/configure-no-expat (2023-07-13) 1 commit
56
+ - configure.ac: Don't overwrite NO_EXPAT option
57
58
+ "./configure --with-expat=no" did not work as a way to refuse use
59
+ of the expat library on a system with the library installed, which
60
+ has been corrected.
61
205
-* jk/cherry-pick-revert-status (2023-06-27) 1 commit
206
- (merged to 'next' on 2023-06-28 at 4a0d88ef7a)
207
- + fix cherry-pick/revert status when doing multiple commits
62
+ Review response sent.
63
+ cf. <xmqqwmz3pwx2.fsf@gitster.g>
64
+ source: <20230713074654.23957-1-aherrmann@suse.de>
65
209
- During a cherry-pick or revert session that works on multiple
210
- commits, "git status" did not give correct information, which has
211
- been corrected.
212
- source: <20230627224230.1951135-1-jacob.e.keller@intel.com>
66
67
+* jc/branch-in-use-error-message (2023-07-12) 1 commit
68
+ - branch: update the message to refuse touching a branch in-use
69
215
-* jk/fsck-indices-in-worktrees (2023-06-29) 1 commit
216
- (merged to 'next' on 2023-06-29 at 9d245b3681)
217
- + fsck: avoid misleading variable name
70
+ "git branch -f X" to repoint the branch X seid that X was "checked
71
+ out" in another worktree, even when branch X was not and instead
72
+ being bisected or rebased. The message was reworded to say the
73
+ branch was "in use".
74
219
- Code clarification.
220
- source: <20230629181333.87465-1-ericsunshine@charter.net>
221
-
222
-
223
-* js/empty-index-fixes (2023-06-29) 3 commits
224
- (merged to 'next' on 2023-06-29 at cdfd131900)
225
- + commit -a -m: allow the top-level tree to become empty again
226
- + split-index: accept that a base index can be empty
227
- + do_read_index(): always mark index as initialized unless erroring out
228
-
229
- A few places failed to differenciate the case where the index is
230
- truly empty (nothing added) and we haven't yet read from the
231
- on-disk index file, which have been corrected.
232
- source: <pull.1554.git.1688044991.gitgitgadget@gmail.com>
233
-
234
-
235
-* ks/t4205-test-describe-with-abbrev-fix (2023-06-29) 1 commit
236
- (merged to 'next' on 2023-06-29 at 5fc309dc75)
237
- + t4205: correctly test %(describe:abbrev=...)
238
-
239
- Test update.
240
- source: <20230629133841.18784-2-five231003@gmail.com>
241
-
242
-
243
-* pb/complete-diff-options (2023-06-26) 24 commits
244
- (merged to 'next' on 2023-06-28 at ccff93557d)
245
- + diff.c: mention completion above add_diff_options
246
- + completion: complete --remerge-diff
247
- + completion: complete --diff-merges, its options and --no-diff-merges
248
- + completion: move --pickaxe-{all,regex} to __git_diff_common_options
249
- + completion: complete --ws-error-highlight
250
- + completion: complete --unified
251
- + completion: complete --output-indicator-{context,new,old}
252
- + completion: complete --output
253
- + completion: complete --no-stat
254
- + completion: complete --no-relative
255
- + completion: complete --line-prefix
256
- + completion: complete --ita-invisible-in-index and --ita-visible-in-index
257
- + completion: complete --irreversible-delete
258
- + completion: complete --ignore-matching-lines
259
- + completion: complete --function-context
260
- + completion: complete --find-renames
261
- + completion: complete --find-object
262
- + completion: complete --find-copies
263
- + completion: complete --default-prefix
264
- + completion: complete --compact-summary
265
- + completion: complete --combined-all-paths
266
- + completion: complete --cc
267
- + completion: complete --break-rewrites
268
- + completion: add comments describing __git_diff_* globals
269
-
270
- Completion updates.
271
- source: <pull.1543.v3.git.1687796688.gitgitgadget@gmail.com>
272
-
273
-
274
-* pw/apply-too-large (2023-06-26) 1 commit
275
- (merged to 'next' on 2023-06-28 at c0460d682c)
276
- + apply: improve error messages when reading patch
277
-
278
- "git apply" punts when it is fed too large a patch input; the error
279
- message it gives when it happens has been clarified.
280
- source: <pull.1552.git.1687772253869.gitgitgadget@gmail.com>
281
-
282
-
283
-* rs/strbuf-expand-step (2023-06-18) 5 commits
284
- (merged to 'next' on 2023-06-28 at 1918915b71)
285
- + strbuf: simplify strbuf_expand_literal_cb()
286
- + replace strbuf_expand() with strbuf_expand_step()
287
- + replace strbuf_expand_dict_cb() with strbuf_expand_step()
288
- + strbuf: factor out strbuf_expand_step()
289
- + pretty: factor out expand_separator()
290
-
291
- Code clean-up around strbuf_expand() API.
292
- source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
293
-
294
-
295
-* tl/notes-separator (2023-06-21) 7 commits
296
- (merged to 'next' on 2023-06-28 at 74fa459f4d)
297
- + notes: introduce "--no-separator" option
298
- + notes.c: introduce "--[no-]stripspace" option
299
- + notes.c: append separator instead of insert by pos
300
- + notes.c: introduce '--separator=<paragraph-break>' option
301
- + t3321: add test cases about the notes stripspace behavior
302
- + notes.c: use designated initializers for clarity
303
- + notes.c: cleanup 'strbuf_grow' call in 'append_edit'
304
-
305
- 'git notes append' was taught '--separator' to specify string to insert
306
- between paragraphs.
307
- source: <cover.1685174011.git.dyroneteng@gmail.com>
75
+ Will merge to 'next'?
76
+ source: <xmqqy1jkrcmg.fsf_-_@gitster.g>
77
+
78
+
79
+* tb/object-access-overflow-protection (2023-07-12) 20 commits
80
+ - commit-graph.c: prevent overflow in `verify_commit_graph()`
81
+ - commit-graph.c: prevent overflow in `write_commit_graph()`
82
+ - commit-graph.c: prevent overflow in `merge_commit_graph()`
83
+ - commit-graph.c: prevent overflow in `split_graph_merge_strategy()`
84
+ - commit-graph.c: prevent overflow in `load_tree_for_commit()`
85
+ - commit-graph.c: prevent overflow in `fill_commit_in_graph()`
86
+ - commit-graph.c: prevent overflow in `fill_commit_graph_info()`
87
+ - commit-graph.c: prevent overflow in `load_oid_from_graph()`
88
+ - commit-graph.c: prevent overflow in add_graph_to_chain()
89
+ - commit-graph.c: prevent overflow in `write_commit_graph_file()`
90
+ - pack-bitmap.c: ensure that eindex lookups don't overflow
91
+ - midx.c: prevent overflow in `fill_included_packs_batch()`
92
+ - midx.c: prevent overflow in `write_midx_internal()`
93
+ - midx.c: store `nr`, `alloc` variables as `size_t`'s
94
+ - midx.c: prevent overflow in `nth_midxed_offset()`
95
+ - midx.c: prevent overflow in `nth_midxed_object_oid()`
96
+ - midx.c: use `size_t`'s for fanout nr and alloc
97
+ - packfile.c: use checked arithmetic in `nth_packed_object_offset()`
98
+ - packfile.c: prevent overflow in `load_idx()`
99
+ - packfile.c: prevent overflow in `nth_packed_object_id()`
100
+
101
+ Various offset computation in the code that accesses the packfiles
102
+ and other data in the object layer has been hardened against
103
+ arithmetic overflow, especially on 32-bit systems.
104
+
105
+ Expecting a reroll or a fix-up.
106
+ cf. <5d2cf09f-34c7-9a88-bab2-8bf348dd13bb@gmail.com>
107
+ source: <cover.1689205042.git.me@ttaylorr.com>
108
+
109
+
110
+* jc/doc-submodule-update-settings (2023-07-13) 1 commit
111
+ - submodule: clarify that "!custom command" is the only oddball
112
+
113
+ Rewrite the description of giving a custom command to the
114
+ submodule.<name>.update configuraiton variable.
115
+
116
+ source: <xmqqwmz3oacg.fsf@gitster.g>
117
118
--------------------------------------------------
119
[Stalled]
@@ -315,7 +124,8 @@ Release tarballs are available at:
124
Fix fsmonitor on Windows when the filesystem path contains certain
125
characters.
126
318
- Expecting a reroll.
127
+ Will discard.
128
+ Have been expecting a reroll for too long.
129
cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
130
source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
131
@@ -326,7 +136,8 @@ Release tarballs are available at:
136
"git diff-index" command has been taught to work better with the
137
sparse index.
138
329
- Expecting a reroll.
139
+ Will discard.
140
+ Have been expecting a reroll for too long.
141
cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
142
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
143
@@ -339,7 +150,8 @@ Release tarballs are available at:
150
the value can spell a Boolean in various ways. The support for the
151
syntax is being dropped.
152
342
- Expecting a reroll.
153
+ Will discard.
154
+ Have been expecting a reroll for too long.
155
cf. <ZDSTFwMFO7vbj/du@google.com>
156
source: <ZDSTFwMFO7vbj/du@google.com>
157
@@ -351,7 +163,8 @@ Release tarballs are available at:
163
"git checkout -B $branch" failed to protect against checking out
164
a branch that is checked out elsewhere, unlike "git branch -f" did.
165
354
- Expecting a hopefully minor and final reroll.
166
+ Will discard.
167
+ Have been expecting a hopefully minor and final reroll for too long.
168
cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
169
source: <20230120113553.24655-1-carenas@gmail.com>
170
@@ -364,7 +177,7 @@ Release tarballs are available at:
177
more inline with the original spirit of "rebuild your side on top
178
of theirs".
179
367
- May want to discard.
180
+ Will discard.
181
This is too much of a departure from the existing practice.
182
cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
183
cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
@@ -379,6 +192,9 @@ Release tarballs are available at:
192
193
Hardening checks around mismatched object types when one of those
194
objects is a tag.
195
+
196
+ Will discard.
197
+ Stalled for too long.
198
source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
199
200
@@ -388,7 +204,8 @@ Release tarballs are available at:
204
Allow summary results from tests to be written to t/test-results
205
directory even when a test harness like 'prove' is in use.
206
391
- Expecting a reroll.
207
+ Will discard.
208
+ Have been expecting a reroll for too long.
209
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
210
source: <20221224225200.1027806-1-adam@dinwoodie.org>
211
@@ -402,7 +219,7 @@ Release tarballs are available at:
219
220
Assorted updates to "--diff-merges=X" option.
221
405
- May want to discard.
222
+ Will discard.
223
Breaking compatibility does not seem worth it.
224
source: <20221217132955.108542-1-sorganov@gmail.com>
225
@@ -418,7 +235,8 @@ Release tarballs are available at:
235
Give a hard dependency on cURL library to build "git imap-send",
236
and remove the code to interact with IMAP server without using cURL.
237
421
- Expecting a reroll.
238
+ Will discard.
239
+ Have been expecting a reroll for too long.
240
The 'tunnel' part is still iffy.
241
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
242
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
@@ -435,14 +253,151 @@ Release tarballs are available at:
253
"git submodule status" learned to run the comparison in submodule
254
repositories in parallel.
255
438
- Expecting a reroll.
256
+ Will discard.
257
+ Have been expecting a reroll for too long.
258
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
259
cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
260
source: <20230302215237.1473444-1-calvinwan@google.com>
261
262
+
263
+* ob/revert-of-revert (2023-05-05) 1 commit
264
+ - sequencer: beautify subject of reverts of reverts
265
+
266
+ Instead of "Revert "Revert "original"", give "Reapply "original""
267
+ as the title for a revert of a revert.
268
+
269
+ Will discard.
270
+ Have been expecting a hopefully final reroll for too long.
271
+ Looking much better, except for minor cosmetic issues.
272
+ cf. <xmqqmt21txid.fsf@gitster.g>
273
+ source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
274
+
275
+
276
+* pw/rebase-i-after-failure (2023-04-21) 6 commits
277
+ - rebase -i: fix adding failed command to the todo list
278
+ - rebase: fix rewritten list for failed pick
279
+ - rebase --continue: refuse to commit after failed command
280
+ - sequencer: factor out part of pick_commits()
281
+ - rebase -i: remove patch file after conflict resolution
282
+ - rebase -i: move unlink() calls
283
+
284
+ Various fixes to the behaviour of "rebase -i" when the command got
285
+ interrupted by conflicting changes.
286
+
287
+ Expecting a reroll.
288
+ cf. <xmqqsfcthrpb.fsf@gitster.g>
289
+ cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
290
+ source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
291
+
292
--------------------------------------------------
293
[Cooking]
294
295
+* ah/advise-force-pushing (2023-07-13) 3 commits
296
+ - push: don't imply that integration is always required before pushing
297
+ - remote: don't imply that integration is always required before pushing
298
+ - wt-status: don't show divergence advice when committing
299
+
300
+ Help newbies by suggesting that there are cases where force-pushing
301
+ is a valid and sensible thing to update a branch at a remote
302
+ repository, rather than reconciling with merge/rebase.
303
+
304
+ Will merge to 'next'.
305
+ cf. <919d1ba8-bb8b-a77b-cef3-db14f168ed4a@gmail.com>
306
+ source: <20230713044128.3771818-1-alexhenrie24@gmail.com>
307
+
308
+
309
+* jc/pathspec-match-with-common-prefix (2023-07-08) 2 commits
310
+ (merged to 'next' on 2023-07-10 at 4146f391ed)
311
+ + dir: match "attr" pathspec magic with correct paths
312
+ + t6135: attr magic with path pattern
313
+
314
+ "git ls-files '(attr:X)D/'" that triggers the common prefix
315
+ optimization codepath failed to read from "D/.gitattributes",
316
+ which has been corrected.
317
+
318
+ Will merge to 'master'.
319
+ source: <20230707220457.3655121-1-gitster@pobox.com>
320
+
321
+
322
+* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
323
+ - tree-walk: drop unused base_offset from do_match()
324
+ - tree-walk: lose base_offset that is never used in tree_entry_interesting
325
+
326
+ Code simplification.
327
+
328
+ Needs review.
329
+ source: <20230707222116.4129415-1-gitster@pobox.com>
330
+
331
+
332
+* rs/ls-tree-prefix-simplify (2023-07-07) 1 commit
333
+ (merged to 'next' on 2023-07-08 at 3e4826525f)
334
+ + ls-tree: simplify prefix handling
335
+
336
+ Code simplification.
337
+
338
+ Will merge to 'master'.
339
+ source: <b34aa99b-2bf1-c645-bdf5-03ac258b4bf5@web.de>
340
+
341
+
342
+* rs/pretty-format-double-negation-fix (2023-07-07) 1 commit
343
+ (merged to 'next' on 2023-07-08 at 6674b562ff)
344
+ + pretty: avoid double negative in format_commit_item()
345
+
346
+ Code clarification.
347
+
348
+ Will merge to 'master'.
349
+ source: <8d4fcad1-5f71-4790-17ee-e9ba0a3118dc@web.de>
350
+
351
+
352
+* rs/userformat-find-requirements-simplify (2023-07-07) 1 commit
353
+ (merged to 'next' on 2023-07-08 at 6cdc328a08)
354
+ + pretty: use strchr(3) in userformat_find_requirements()
355
+
356
+ Code simplification.
357
+
358
+ Will merge to 'master'.
359
+ source: <108ab1a2-28f4-dd62-1f90-64f37708aa8c@web.de>
360
+
361
+
362
+* mh/doc-credential-helpers (2023-07-10) 1 commit
363
+ (merged to 'next' on 2023-07-11 at a391669194)
364
+ + doc: gitcredentials: link to helper list
365
+
366
+ Doc update.
367
+
368
+ Will merge to 'master'.
369
+ source: <pull.1538.v3.git.1688848614262.gitgitgadget@gmail.com>
370
+
371
+
372
+* tb/fsck-no-progress (2023-07-10) 6 commits
373
+ (merged to 'next' on 2023-07-11 at aab8389518)
374
+ + commit-graph.c: avoid duplicated progress output during `verify`
375
+ + commit-graph.c: pass progress to `verify_one_commit_graph()`
376
+ + commit-graph.c: iteratively verify commit-graph chains
377
+ + commit-graph.c: extract `verify_one_commit_graph()`
378
+ + fsck: suppress MIDX output with `--no-progress`
379
+ + fsck: suppress commit-graph output with `--no-progress`
380
+
381
+ "git fsck --no-progress" still spewed noise from the commit-graph
382
+ subsystem, which has been corrected.
383
+
384
+ Will merge to 'master'.
385
+ source: <cover.1688776280.git.me@ttaylorr.com>
386
+
387
+
388
+* tb/repack-cleanup (2023-07-11) 2 commits
389
+ (merged to 'next' on 2023-07-11 at f598c59a8a)
390
+ + builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
391
+ + builtin/repack.c: only repack `.pack`s that exist
392
+
393
+ The recent change to "git repack" made it react less nicely when a
394
+ leftover .idx file that no longer has the corresponding .pack file
395
+ in the repository, which has been corrected.
396
+
397
+ Will merge to 'master'.
398
+ source: <cover.1689096750.git.me@ttaylorr.com>
399
+
400
+
401
* cw/compat-util-header-cleanup (2023-07-05) 6 commits
402
(merged to 'next' on 2023-07-08 at c244b65c4f)
403
+ git-compat-util: move alloc macros to git-compat-util.h
@@ -618,27 +573,28 @@ Release tarballs are available at:
573
574
575
* tb/refs-exclusion-and-packed-refs (2023-07-10) 16 commits
621
- - ls-refs.c: avoid enumerating hidden refs where possible
622
- - upload-pack.c: avoid enumerating hidden refs where possible
623
- - builtin/receive-pack.c: avoid enumerating hidden references
624
- - refs.h: implement `hidden_refs_to_excludes()`
625
- - refs.h: let `for_each_namespaced_ref()` take excluded patterns
626
- - revision.h: store hidden refs in a `strvec`
627
- - refs/packed-backend.c: add trace2 counters for jump list
628
- - refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
629
- - refs/packed-backend.c: refactor `find_reference_location()`
630
- - refs: plumb `exclude_patterns` argument throughout
631
- - builtin/for-each-ref.c: add `--exclude` option
632
- - ref-filter.c: parameterize match functions over patterns
633
- - ref-filter: add `ref_filter_clear()`
634
- - ref-filter: clear reachable list pointers after freeing
635
- - ref-filter.h: provide `REF_FILTER_INIT`
636
- - refs.c: rename `ref_filter`
576
+ (merged to 'next' on 2023-07-13 at 6d72f3e995)
577
+ + ls-refs.c: avoid enumerating hidden refs where possible
578
+ + upload-pack.c: avoid enumerating hidden refs where possible
579
+ + builtin/receive-pack.c: avoid enumerating hidden references
580
+ + refs.h: implement `hidden_refs_to_excludes()`
581
+ + refs.h: let `for_each_namespaced_ref()` take excluded patterns
582
+ + revision.h: store hidden refs in a `strvec`
583
+ + refs/packed-backend.c: add trace2 counters for jump list
584
+ + refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
585
+ + refs/packed-backend.c: refactor `find_reference_location()`
586
+ + refs: plumb `exclude_patterns` argument throughout
587
+ + builtin/for-each-ref.c: add `--exclude` option
588
+ + ref-filter.c: parameterize match functions over patterns
589
+ + ref-filter: add `ref_filter_clear()`
590
+ + ref-filter: clear reachable list pointers after freeing
591
+ + ref-filter.h: provide `REF_FILTER_INIT`
592
+ + refs.c: rename `ref_filter`
593
594
Enumerating refs in the packed-refs file, while excluding refs that
595
match certain patterns, has been optimized.
596
641
- Under discussion.
597
+ Will merge to 'master'.
598
source: <cover.1689023520.git.me@ttaylorr.com>
599
600
@@ -660,31 +616,3 @@ Release tarballs are available at:
616
- t6429: remove switching aspects of fast-rebase
617
618
source: <20230602102533.876905-1-christian.couder@gmail.com>
663
-
664
-
665
-* ob/revert-of-revert (2023-05-05) 1 commit
666
- - sequencer: beautify subject of reverts of reverts
667
-
668
- Instead of "Revert "Revert "original"", give "Reapply "original""
669
- as the title for a revert of a revert.
670
-
671
- Expecting a hopefully final reroll.
672
- Looking much better, except for minor cosmetic issues.
673
- source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
674
-
675
-
676
-* pw/rebase-i-after-failure (2023-04-21) 6 commits
677
- - rebase -i: fix adding failed command to the todo list
678
- - rebase: fix rewritten list for failed pick
679
- - rebase --continue: refuse to commit after failed command
680
- - sequencer: factor out part of pick_commits()
681
- - rebase -i: remove patch file after conflict resolution
682
- - rebase -i: move unlink() calls
683
-
684
- Various fixes to the behaviour of "rebase -i" when the command got
685
- interrupted by conflicting changes.
686
-
687
- Expecting a reroll.
688
- cf. <xmqqsfcthrpb.fsf@gitster.g>
689
- cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
690
- source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>