What's cooking (2023/07 #06)
Junio C Hamano committed
Jul 27, 2023 at 15:45 UTC
c486f9e604c4c9e8f1dadcddeecd9430ef1f0fb5
1 file changed
+258
-374
whats-cooking.txt
+258
-374
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2023, #05; Tue, 25)
3
-X-master-at: a80be152923a46f04a06bade7bcc72870e46ca09
4
-X-next-at: 7dcf015ea4152b2113f79acb1e230aef744551f3
2
+Subject: What's cooking in git.git (Jul 2023, #06; Thu, 27)
3
+X-master-at: bfce02c22f3f1b0539686cabb69a637854448be3
4
+X-next-at: a95def55d0faaf65aa3e0af7c4586ec520f28f9a
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2023, #05; Tue, 25)
7
+What's cooking in git.git (Jul 2023, #06; Thu, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,154 +48,174 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* ah/advise-force-pushing (2023-07-13) 3 commits
52
- (merged to 'next' on 2023-07-17 at b040e8280e)
53
- + push: don't imply that integration is always required before pushing
54
- + remote: don't imply that integration is always required before pushing
55
- + wt-status: don't show divergence advice when committing
51
+* jc/am-parseopt-fix (2023-07-18) 1 commit
52
+ (merged to 'next' on 2023-07-19 at eaf592531e)
53
+ + am: simplify parsing of "--[no-]keep-cr"
54
57
- Help newbies by suggesting that there are cases where force-pushing
58
- is a valid and sensible thing to update a branch at a remote
59
- repository, rather than reconciling with merge/rebase.
60
- source: <20230713044128.3771818-1-alexhenrie24@gmail.com>
55
+ Code simplification.
56
+ source: <xmqqr0p5gjv3.fsf@gitster.g>
57
58
63
-* dk/bundle-i18n-more (2023-07-13) 1 commit
64
- (merged to 'next' on 2023-07-18 at a9745efbe2)
65
- + i18n: mark more bundle.c strings for translation
59
+* jc/branch-parseopt-fix (2023-07-18) 1 commit
60
+ (merged to 'next' on 2023-07-19 at 738d25bbb6)
61
+ + branch: reject "--no-all" and "--no-remotes" early
62
67
- Update message mark-up for i18n in "git bundle".
68
- source: <pull.1550.git.1689285683013.gitgitgadget@gmail.com>
63
+ Command line parser fixes.
64
+ source: <xmqqjzuxgjmi.fsf@gitster.g>
65
66
71
-* dk/t4002-syntaxo-fix (2023-07-14) 1 commit
72
- (merged to 'next' on 2023-07-17 at 75d729ee52)
73
- + t4002: fix "diff can read from stdin" syntax
67
+* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit
68
+ (merged to 'next' on 2023-07-20 at ecfc9c6118)
69
+ + gitignore.txt: mark up explanation of patterns consistently
70
75
- Test fix.
76
- source: <pull.1545.git.git.1689341410476.gitgitgadget@gmail.com>
71
+ Doc mark-up update.
72
+ source: <xmqqwmyxglhg.fsf@gitster.g>
73
74
79
-* jk/nested-points-at (2023-07-17) 4 commits
80
- (merged to 'next' on 2023-07-18 at cf33f44a50)
81
- + ref-filter: simplify return type of match_points_at
82
- + ref-filter: avoid parsing non-tags in match_points_at()
83
- + ref-filter: avoid parsing tagged objects in match_points_at()
84
- + ref-filter: handle nested tags in --points-at option
75
+* jc/parse-options-reset (2023-07-19) 1 commit
76
+ (merged to 'next' on 2023-07-20 at d2178a4bd4)
77
+ + reset: reject --no-(mixed|soft|hard|merge|keep) option
78
86
- "git tag --list --points-at X" showed tags that directly refers to
87
- object X, but did not list a tag that points at such a tag, which
88
- has been corrected.
89
- source: <20230702223342.GA1598765@coredump.intra.peff.net>
90
-
91
-
92
-* jk/unused-parameter (2023-07-13) 14 commits
93
- (merged to 'next' on 2023-07-18 at 59d8f4ec1e)
94
- + t/helper: mark unused callback void data parameters
95
- + tag: mark unused parameters in each_tag_name_fn callbacks
96
- + rev-parse: mark unused parameter in for_each_abbrev callback
97
- + replace: mark unused parameter in each_mergetag_fn callback
98
- + replace: mark unused parameter in ref callback
99
- + merge-tree: mark unused parameter in traverse callback
100
- + fsck: mark unused parameters in various fsck callbacks
101
- + revisions: drop unused "opt" parameter in "tweak" callbacks
102
- + count-objects: mark unused parameter in alternates callback
103
- + am: mark unused keep_cr parameters
104
- + http-push: mark unused parameter in xml callback
105
- + http: mark unused parameters in curl callbacks
106
- + do_for_each_ref_helper(): mark unused repository parameter
107
- + test-ref-store: drop unimplemented reflog-expire command
108
-
109
- Mark-up unused parameters in the code so that we can eventually
110
- enable -Wunused-parameter by default.
111
- source: <20230703064347.GA3524892@coredump.intra.peff.net>
112
-
113
-
114
-* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
115
- (merged to 'next' on 2023-07-17 at 2c72856851)
116
- + mingw: use lowercase includes for some Windows headers
117
-
118
- Names of MinGW header files are spelled in mixed case in some
119
- source files, but the build host can be using case sensitive
120
- filesystem with header files with their name spelled in all
121
- lowercase.
122
- source: <20230604211934.1365289-1-mh@glandium.org>
123
-
124
-
125
-* rs/ref-filter-signature-fix (2023-07-17) 1 commit
126
- (merged to 'next' on 2023-07-18 at e74f016a60)
127
- + t6300: fix setup with GPGSSH but without GPG
128
-
129
- Test fix.
130
- source: <cbc22750-af93-9274-2ed4-6dfd356568e8@web.de>
131
-
132
-
133
-* rs/strbuf-addftime-simplify (2023-07-17) 1 commit
134
- (merged to 'next' on 2023-07-18 at d665b0f0e9)
135
- + strbuf: use skip_prefix() in strbuf_addftime()
136
-
137
- Code clean-up.
138
- source: <fccba24c-584d-6329-69a7-75cf0458af7d@web.de>
139
-
140
-
141
-* tb/object-access-overflow-protection (2023-07-14) 20 commits
142
- (merged to 'next' on 2023-07-17 at 9ad8a08011)
143
- + commit-graph.c: prevent overflow in `verify_commit_graph()`
144
- + commit-graph.c: prevent overflow in `write_commit_graph()`
145
- + commit-graph.c: prevent overflow in `merge_commit_graph()`
146
- + commit-graph.c: prevent overflow in `split_graph_merge_strategy()`
147
- + commit-graph.c: prevent overflow in `load_tree_for_commit()`
148
- + commit-graph.c: prevent overflow in `fill_commit_in_graph()`
149
- + commit-graph.c: prevent overflow in `fill_commit_graph_info()`
150
- + commit-graph.c: prevent overflow in `load_oid_from_graph()`
151
- + commit-graph.c: prevent overflow in add_graph_to_chain()
152
- + commit-graph.c: prevent overflow in `write_commit_graph_file()`
153
- + pack-bitmap.c: ensure that eindex lookups don't overflow
154
- + midx.c: prevent overflow in `fill_included_packs_batch()`
155
- + midx.c: prevent overflow in `write_midx_internal()`
156
- + midx.c: store `nr`, `alloc` variables as `size_t`'s
157
- + midx.c: prevent overflow in `nth_midxed_offset()`
158
- + midx.c: prevent overflow in `nth_midxed_object_oid()`
159
- + midx.c: use `size_t`'s for fanout nr and alloc
160
- + packfile.c: use checked arithmetic in `nth_packed_object_offset()`
161
- + packfile.c: prevent overflow in `load_idx()`
162
- + packfile.c: prevent overflow in `nth_packed_object_id()`
163
-
164
- Various offset computation in the code that accesses the packfiles
165
- and other data in the object layer has been hardened against
166
- arithmetic overflow, especially on 32-bit systems.
167
- source: <ZLAJNbIBFUPHYhlt@nand.local>
168
- source: <cover.1689205042.git.me@ttaylorr.com>
169
-
170
-
171
-* tb/refs-exclusion-and-packed-refs (2023-07-10) 16 commits
172
- (merged to 'next' on 2023-07-13 at 6d72f3e995)
173
- + ls-refs.c: avoid enumerating hidden refs where possible
174
- + upload-pack.c: avoid enumerating hidden refs where possible
175
- + builtin/receive-pack.c: avoid enumerating hidden references
176
- + refs.h: implement `hidden_refs_to_excludes()`
177
- + refs.h: let `for_each_namespaced_ref()` take excluded patterns
178
- + revision.h: store hidden refs in a `strvec`
179
- + refs/packed-backend.c: add trace2 counters for jump list
180
- + refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
181
- + refs/packed-backend.c: refactor `find_reference_location()`
182
- + refs: plumb `exclude_patterns` argument throughout
183
- + builtin/for-each-ref.c: add `--exclude` option
184
- + ref-filter.c: parameterize match functions over patterns
185
- + ref-filter: add `ref_filter_clear()`
186
- + ref-filter: clear reachable list pointers after freeing
187
- + ref-filter.h: provide `REF_FILTER_INIT`
188
- + refs.c: rename `ref_filter`
189
-
190
- Enumerating refs in the packed-refs file, while excluding refs that
191
- match certain patterns, has been optimized.
192
- source: <cover.1689023520.git.me@ttaylorr.com>
79
+ Command line parser fix.
80
+ source: <xmqq1qh4c998.fsf@gitster.g>
81
+
82
+
83
+* jc/parse-options-show-branch (2023-07-19) 2 commits
84
+ (merged to 'next' on 2023-07-20 at 4fa809c2f2)
85
+ + show-branch: reject --[no-](topo|date)-order
86
+ + show-branch: --no-sparse should give dense output
87
+
88
+ Command line parser fixes.
89
+ source: <xmqqh6pzc15n.fsf@gitster.g>
90
+
91
+
92
+* jc/transport-parseopt-fix (2023-07-18) 2 commits
93
+ (merged to 'next' on 2023-07-20 at 07f0026aaa)
94
+ + fetch: reject --no-ipv[46]
95
+ + parse-options: introduce OPT_IPVERSION()
96
+
97
+ Command line parser fixes.
98
+ source: <xmqqedl4gag8.fsf@gitster.g>
99
+
100
+
101
+* jr/gitignore-doc-example-markup (2023-07-18) 1 commit
102
+ (merged to 'next' on 2023-07-19 at 4f2ece568d)
103
+ + gitignore.txt: use backticks instead of double quotes
104
+
105
+ Doc update.
106
+ source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>
107
+
108
+
109
+* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit
110
+ (merged to 'next' on 2023-07-19 at 86e570c084)
111
+ + ls-tree: fix --no-full-name
112
+
113
+ Command line parser fix.
114
+ source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>
115
116
--------------------------------------------------
117
[New Topics]
118
119
+* pv/doc-submodule-update-settings (2023-07-25) 1 commit
120
+ (merged to 'next' on 2023-07-27 at e27b5b7ba8)
121
+ + doc: highlight that .gitmodules does not support !command
122
+
123
+ Rewrite the description of giving a custom command to the
124
+ submodule.<name>.update configuraiton variable.
125
+
126
+ Will merge to 'master'.
127
+ source: <20230725212218.711116-1-pvutov@imap.cc>
128
+
129
+
130
+* la/doc-choose-starting-point-fixup (2023-07-27) 3 commits
131
+ - SubmittingPatches: use of older maintenance tracks is an exception
132
+ - SubmittingPatches: explain why 'next' and above are inappropriate base
133
+ - SubmittingPatches: choice of base for fixing an older maintenance track
134
+ (this branch uses la/doc-choose-starting-point.)
135
+
136
+ Clarify how to pick a starting point for a new topic in the
137
+ SubmittingPatches document.
138
+
139
+ Will merge to 'next'.
140
+ source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
141
+ source: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>
142
+
143
+
144
+* jc/resolve-undo-fixes (2023-07-27) 3 commits
145
+ - update-index: use unmerge_index_entry() to support removal
146
+ - resolve-undo: allow resurrecting conflicted state that resolved to deletion
147
+ - update-index: do not read HEAD and MERGE_HEAD unconditionally
148
+
149
+ Assorted fixes and clean-up around resolve-undo data.
150
+
151
+ source: <xmqqtttp9g6r.fsf@gitster.g>
152
+
153
+--------------------------------------------------
154
+[Stalled]
155
+
156
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
157
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
158
+
159
+ "git cherry-pick A" that replays a single commit stopped before
160
+ clobbering local modification, but "git cherry-pick A..B" did not,
161
+ which has been corrected.
162
+
163
+ Expecting a reroll.
164
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
165
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
166
+
167
+
168
+* ab/tag-object-type-errors (2023-05-10) 4 commits
169
+ - tag: don't emit potentially incorrect "object is a X, not a Y"
170
+ - tag: don't misreport type of tagged objects in errors
171
+ - object tests: add test for unexpected objects in tags
172
+ - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
173
+
174
+ Hardening checks around mismatched object types when one of those
175
+ objects is a tag.
176
+
177
+ Will discard.
178
+ Stalled for too long.
179
+ source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
180
+
181
+
182
+* ob/revert-of-revert (2023-05-05) 1 commit
183
+ - sequencer: beautify subject of reverts of reverts
184
+
185
+ Instead of "Revert "Revert "original"", give "Reapply "original""
186
+ as the title for a revert of a revert.
187
+
188
+ Will discard.
189
+ Have been expecting a hopefully final reroll for too long.
190
+ Looking much better, except for minor cosmetic issues.
191
+ cf. <xmqqmt21txid.fsf@gitster.g>
192
+ source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
193
+
194
+
195
+* pw/rebase-i-after-failure (2023-04-21) 6 commits
196
+ - rebase -i: fix adding failed command to the todo list
197
+ - rebase: fix rewritten list for failed pick
198
+ - rebase --continue: refuse to commit after failed command
199
+ - sequencer: factor out part of pick_commits()
200
+ - rebase -i: remove patch file after conflict resolution
201
+ - rebase -i: move unlink() calls
202
+
203
+ Various fixes to the behaviour of "rebase -i" when the command got
204
+ interrupted by conflicting changes.
205
+
206
+ Will discard.
207
+ Have been expecting a reroll for too long.
208
+ cf. <xmqqsfcthrpb.fsf@gitster.g>
209
+ cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
210
+ cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>
211
+ source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
212
+
213
+--------------------------------------------------
214
+[Cooking]
215
+
216
* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit
198
- - sequencer: finish parsing the todo list despite an invalid first line
217
+ (merged to 'next' on 2023-07-26 at 24e74d9eda)
218
+ + sequencer: finish parsing the todo list despite an invalid first line
219
220
When the user edits "rebase -i" todo file so that it starts with a
221
"fixup", which would make it invalid, the command truncated the
@@ -203,7 +223,7 @@ Release tarballs are available at:
223
back to the user. Stop truncating to make it easier to correct
224
such a malformed todo file.
225
206
- Will merge to 'next'.
226
+ Will merge to 'master'.
227
cf. <https://lore.kernel.org/git/0d1c5bfd-3ae5-83f0-a333-bbb8510a973a@gmail.com/>
228
source: <20230722212830.132135-2-alexhenrie24@gmail.com>
229
@@ -219,23 +239,25 @@ Release tarballs are available at:
239
240
241
* ks/ref-filter-describe (2023-07-24) 2 commits
222
- - ref-filter: add new "describe" atom
223
- - ref-filter: add multiple-option parsing functions
242
+ (merged to 'next' on 2023-07-26 at f4b3b3b7ef)
243
+ + ref-filter: add new "describe" atom
244
+ + ref-filter: add multiple-option parsing functions
245
246
"git branch --list --format=<format>" and friends are taught
247
a new "%(describe)" placeholder.
248
228
- Will merge to 'next'.
249
+ Will merge to 'master'.
250
source: <20230723162717.68123-1-five231003@gmail.com>
251
252
253
* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit
233
- - wrapper: use trace2 counters to collect fsync stats
254
+ (merged to 'next' on 2023-07-26 at f2c2e3f2b9)
255
+ + wrapper: use trace2 counters to collect fsync stats
256
257
Instead of inventing a custom counter variables for debugging,
258
use existing trace2 facility in the fsync customization codepath.
259
238
- Will merge to 'next'.
260
+ Will merge to 'master'.
261
source: <20230720164823.625815-1-dev+git@drbeat.li>
262
263
@@ -263,15 +285,16 @@ Release tarballs are available at:
285
source: <20230721035758.61956-1-hanyang.tony@bytedance.com>
286
287
266
-* ja/worktree-orphan-fix (2023-07-21) 4 commits
267
- - SQUASH???
268
- - t2400: rewrite regex to avoid unintentional PCRE
269
- - builtin/worktree.c: convert tab in advice to space
270
- - t2400: drop no-op `--sq` from rev-parse call
288
+* ja/worktree-orphan-fix (2023-07-26) 3 commits
289
+ (merged to 'next' on 2023-07-27 at e475016065)
290
+ + t2400: rewrite regex to avoid unintentional PCRE
291
+ + builtin/worktree.c: convert tab in advice to space
292
+ + t2400: drop no-op `--sq` from rev-parse call
293
272
- Expecting a reroll.
273
- cf. <axnxvnmo6ekhhccppinji73ivlandwuqs44epmq4pdefm7ukiv@ejz7bee5xjli>
274
- source: <20230721044012.24360-1-jacobabel@nullpo.dev>
294
+ Fix tests with unportable regex patterns.
295
+
296
+ Will merge to 'master'.
297
+ source: <20230726214202.15775-1-jacobabel@nullpo.dev>
298
299
300
* rs/describe-parseopt-fix (2023-07-21) 1 commit
@@ -296,7 +319,8 @@ Release tarballs are available at:
319
320
321
* jc/retire-get-sha1-hex (2023-07-24) 1 commit
299
- - hex: retire get_sha1_hex()
322
+ (merged to 'next' on 2023-07-27 at eeb9cc37f5)
323
+ + hex: retire get_sha1_hex()
324
325
The implementation of "get_sha1_hex()" that reads a hexadecimal
326
string that spells a full object name has been extended to cope
@@ -304,7 +328,7 @@ Release tarballs are available at:
328
its name survived. Rename it to get_hash_hex(), a name that is
329
more consistent within its friends like get_hash_hex_algop().
330
307
- Will merge to 'next'.
331
+ Will merge to 'master'.
332
source: <xmqq1qgwoqgo.fsf_-_@gitster.g>
333
334
@@ -336,119 +360,6 @@ Release tarballs are available at:
360
Will merge to 'next'?
361
source: <cover.1690216758.git.me@ttaylorr.com>
362
339
---------------------------------------------------
340
-[Stalled]
341
-
342
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
343
- - cherry-pick: refuse cherry-pick sequence if index is dirty
344
-
345
- "git cherry-pick A" that replays a single commit stopped before
346
- clobbering local modification, but "git cherry-pick A..B" did not,
347
- which has been corrected.
348
-
349
- Expecting a reroll.
350
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
351
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
352
-
353
-
354
-* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
355
- - fsmonitor: handle differences between Windows named pipe functions
356
-
357
- Fix fsmonitor on Windows when the filesystem path contains certain
358
- characters.
359
-
360
- Will discard.
361
- Have been expecting a reroll for too long.
362
- cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
363
- source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
364
-
365
-
366
-* rn/sparse-diff-index (2023-04-10) 1 commit
367
- - diff-index: enable sparse index
368
-
369
- "git diff-index" command has been taught to work better with the
370
- sparse index.
371
-
372
- Will discard.
373
- Have been expecting a reroll for too long.
374
- cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
375
- source: <20230408112342.404318-1-nanth.raghul@gmail.com>
376
-
377
-
378
-* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
379
- - usage: clarify --recurse-submodules as a boolean
380
-
381
- The "--[no-]recurse-submodules" option of "git checkout" and others
382
- supported an undocumented syntax --recurse-submodules=<value> where
383
- the value can spell a Boolean in various ways. The support for the
384
- syntax is being dropped.
385
-
386
- Will discard.
387
- Have been expecting a reroll for too long.
388
- cf. <ZDSTFwMFO7vbj/du@google.com>
389
- source: <ZDSTFwMFO7vbj/du@google.com>
390
-
391
-
392
-* cb/checkout-same-branch-twice (2023-03-22) 2 commits
393
- - SQUASH??? the test marked to expect failure passes from day one
394
- - checkout/switch: disallow checking out same branch in multiple worktrees
395
-
396
- "git checkout -B $branch" failed to protect against checking out
397
- a branch that is checked out elsewhere, unlike "git branch -f" did.
398
-
399
- Will discard.
400
- Have been expecting a hopefully minor and final reroll for too long.
401
- cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
402
- source: <20230120113553.24655-1-carenas@gmail.com>
403
-
404
-
405
-* ab/tag-object-type-errors (2023-05-10) 4 commits
406
- - tag: don't emit potentially incorrect "object is a X, not a Y"
407
- - tag: don't misreport type of tagged objects in errors
408
- - object tests: add test for unexpected objects in tags
409
- - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
410
-
411
- Hardening checks around mismatched object types when one of those
412
- objects is a tag.
413
-
414
- Will discard.
415
- Stalled for too long.
416
- source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
417
-
418
-
419
-* ob/revert-of-revert (2023-05-05) 1 commit
420
- - sequencer: beautify subject of reverts of reverts
421
-
422
- Instead of "Revert "Revert "original"", give "Reapply "original""
423
- as the title for a revert of a revert.
424
-
425
- Will discard.
426
- Have been expecting a hopefully final reroll for too long.
427
- Looking much better, except for minor cosmetic issues.
428
- cf. <xmqqmt21txid.fsf@gitster.g>
429
- source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
430
-
431
-
432
-* pw/rebase-i-after-failure (2023-04-21) 6 commits
433
- - rebase -i: fix adding failed command to the todo list
434
- - rebase: fix rewritten list for failed pick
435
- - rebase --continue: refuse to commit after failed command
436
- - sequencer: factor out part of pick_commits()
437
- - rebase -i: remove patch file after conflict resolution
438
- - rebase -i: move unlink() calls
439
-
440
- Various fixes to the behaviour of "rebase -i" when the command got
441
- interrupted by conflicting changes.
442
-
443
- Will discard.
444
- Have been expecting a reroll for too long.
445
- cf. <xmqqsfcthrpb.fsf@gitster.g>
446
- cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
447
- cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>
448
- source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
449
-
450
---------------------------------------------------
451
-[Cooking]
363
364
* la/doc-choose-starting-point (2023-07-14) 5 commits
365
(merged to 'next' on 2023-07-19 at 5a807cae46)
@@ -457,54 +368,15 @@ Release tarballs are available at:
368
+ SubmittingPatches: de-emphasize branches as starting points
369
+ SubmittingPatches: discuss subsystems separately from git.git
370
+ SubmittingPatches: reword awkward phrasing
371
+ (this branch is used by la/doc-choose-starting-point-fixup.)
372
373
Clarify how to choose the starting point for a new topic in
374
developer guidance document.
375
464
- Will merge to 'master'.
376
+ Will merge to 'master' together with the follow-on topic.
377
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
378
379
468
-* jr/gitignore-doc-example-markup (2023-07-18) 1 commit
469
- (merged to 'next' on 2023-07-19 at 4f2ece568d)
470
- + gitignore.txt: use backticks instead of double quotes
471
-
472
- Doc update.
473
-
474
- Will merge to 'master'.
475
- source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>
476
-
477
-
478
-* jc/am-parseopt-fix (2023-07-18) 1 commit
479
- (merged to 'next' on 2023-07-19 at eaf592531e)
480
- + am: simplify parsing of "--[no-]keep-cr"
481
-
482
- Code simplification.
483
-
484
- Will merge to 'master'.
485
- source: <xmqqr0p5gjv3.fsf@gitster.g>
486
-
487
-
488
-* jc/branch-parseopt-fix (2023-07-18) 1 commit
489
- (merged to 'next' on 2023-07-19 at 738d25bbb6)
490
- + branch: reject "--no-all" and "--no-remotes" early
491
-
492
- Command line parser fixes.
493
-
494
- Will merge to 'master'.
495
- source: <xmqqjzuxgjmi.fsf@gitster.g>
496
-
497
-
498
-* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit
499
- (merged to 'next' on 2023-07-19 at 86e570c084)
500
- + ls-tree: fix --no-full-name
501
-
502
- Command line parser fix.
503
-
504
- Will merge to 'master'.
505
- source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>
506
-
507
-
380
* jc/doc-sent-patch-now-what (2023-07-19) 1 commit
381
- MyFirstContribution: refrain from self-iterating too much
382
@@ -514,26 +386,6 @@ Release tarballs are available at:
386
source: <xmqqzga9opdu.fsf@gitster.g>
387
388
517
-* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit
518
- (merged to 'next' on 2023-07-20 at ecfc9c6118)
519
- + gitignore.txt: mark up explanation of patterns consistently
520
-
521
- Doc mark-up update.
522
-
523
- Will merge to 'master'.
524
- source: <xmqqwmyxglhg.fsf@gitster.g>
525
-
526
-
527
-* jc/parse-options-reset (2023-07-19) 1 commit
528
- (merged to 'next' on 2023-07-20 at d2178a4bd4)
529
- + reset: reject --no-(mixed|soft|hard|merge|keep) option
530
-
531
- Command line parser fix.
532
-
533
- Will merge to 'master'.
534
- source: <xmqq1qh4c998.fsf@gitster.g>
535
-
536
-
389
* jc/parse-options-short-help (2023-07-19) 3 commits
390
- short help: allow a gap smaller than USAGE_GAP
391
- remote: simplify "remote add --tags" help text
@@ -545,28 +397,6 @@ Release tarballs are available at:
397
source: <xmqq5y6gg8fn.fsf@gitster.g>
398
399
548
-* jc/parse-options-show-branch (2023-07-19) 2 commits
549
- (merged to 'next' on 2023-07-20 at 4fa809c2f2)
550
- + show-branch: reject --[no-](topo|date)-order
551
- + show-branch: --no-sparse should give dense output
552
-
553
- Command line parser fixes.
554
-
555
- Will merge to 'master'.
556
- source: <xmqqh6pzc15n.fsf@gitster.g>
557
-
558
-
559
-* jc/transport-parseopt-fix (2023-07-18) 2 commits
560
- (merged to 'next' on 2023-07-20 at 07f0026aaa)
561
- + fetch: reject --no-ipv[46]
562
- + parse-options: introduce OPT_IPVERSION()
563
-
564
- Command line parser fixes.
565
-
566
- Will merge to 'master'.
567
- source: <xmqqedl4gag8.fsf@gitster.g>
568
-
569
-
400
* sl/sparse-check-attr (2023-07-18) 3 commits
401
- check-attr: integrate with sparse-index
402
- attr.c: read attributes in a sparse directory
@@ -606,17 +436,6 @@ Release tarballs are available at:
436
source: <xmqqr0p1szhz.fsf_-_@gitster.g>
437
438
609
-* jc/doc-submodule-update-settings (2023-07-13) 1 commit
610
- . submodule: clarify that "!custom command" is the only oddball
611
-
612
- Rewrite the description of giving a custom command to the
613
- submodule.<name>.update configuraiton variable.
614
-
615
- Expecting a reroll from the original author.
616
- cf. <0d29ac42-4e8f-71b6-b85f-00de182e2957@imap.cc>
617
- source: <xmqqwmz3oacg.fsf@gitster.g>
618
-
619
-
439
* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
440
(merged to 'next' on 2023-07-25 at cc050c60a6)
441
+ tree-walk: drop unused base_offset from do_match()
@@ -628,28 +447,33 @@ Release tarballs are available at:
447
source: <20230707222116.4129415-1-gitster@pobox.com>
448
449
631
-* mh/credential-erase-improvements-more (2023-06-24) 2 commits
450
+* mh/credential-erase-improvements-more (2023-07-26) 2 commits
451
- credential/wincred: erase matching creds only
452
- credential/libsecret: erase matching creds only
453
454
+ Update two credential helpers to correctly match which credential
455
+ to erase; they dropped not the ones with stale password.
456
+
457
Needs review.
458
+ source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com>
459
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
460
461
462
* cc/repack-sift-filtered-objects-to-separate-pack (2023-07-24) 8 commits
640
- - gc: add `gc.repackFilterTo` config option
641
- - repack: implement `--filter-to` for storing filtered out objects
642
- - gc: add `gc.repackFilter` config option
643
- - repack: add `--filter=<filter-spec>` option
644
- - repack: refactor finding pack prefix
645
- - repack: refactor finishing pack-objects command
646
- - t/helper: add 'find-pack' test-tool
647
- - pack-objects: allow `--filter` without `--stdout`
463
+ . gc: add `gc.repackFilterTo` config option
464
+ . repack: implement `--filter-to` for storing filtered out objects
465
+ . gc: add `gc.repackFilter` config option
466
+ . repack: add `--filter=<filter-spec>` option
467
+ . repack: refactor finding pack prefix
468
+ . repack: refactor finishing pack-objects command
469
+ . t/helper: add 'find-pack' test-tool
470
+ . pack-objects: allow `--filter` without `--stdout`
471
472
"git repack" machinery learns to pay attention to the "--filter="
473
option.
474
652
- Will merge to 'next'.
475
+ Breaks CI with some environment variables configured.
476
+ cf. <xmqqo7jzh9mh.fsf@gitster.g>
477
source: <20230724085909.3831831-1-christian.couder@gmail.com>
478
479
@@ -662,19 +486,22 @@ Release tarballs are available at:
486
source: <0169ce6fb9ccafc089b74ae406db0d1a8ff8ac65.1688165272.git.steadmon@google.com>
487
488
665
-* jt/path-filter-fix (2023-07-13) 4 commits
489
+* jt/path-filter-fix (2023-07-25) 7 commits
490
- commit-graph: new filter ver. that fixes murmur3
491
- repo-settings: introduce commitgraph.changedPathsVersion
492
- t4216: test changed path filters with high bit paths
493
+ - t/helper/test-read-graph: implement `bloom-filters` mode
494
+ - bloom.h: make `load_bloom_filter_from_graph()` public
495
+ - t/helper/test-read-graph.c: extract `dump_graph_info()`
496
- gitformat-commit-graph: describe version 2 of BDAT
497
498
The Bloom filter used for path limited history traversal was broken
499
on systems whose "char" is unsigned; update the implementation and
500
bump the format version to 2.
501
675
- Expecting a reroll.
676
- cf. <20230720202203.3816309-1-jonathantanmy@google.com>
677
- source: <cover.1689283789.git.jonathantanmy@google.com>
502
+ Still under discussion.
503
+ cf. <20230727205308.401364-1-jonathantanmy@google.com>
504
+ source: <cover.1689889382.git.jonathantanmy@google.com>
505
506
507
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
@@ -711,6 +538,16 @@ Release tarballs are available at:
538
--------------------------------------------------
539
[Discarded]
540
541
+* jc/doc-submodule-update-settings (2023-07-13) 1 commit
542
+ . submodule: clarify that "!custom command" is the only oddball
543
+
544
+ Rewrite the description of giving a custom command to the
545
+ submodule.<name>.update configuraiton variable.
546
+
547
+ Superseded by pv/doc-submodule-update-settings topic.
548
+ source: <xmqqwmz3oacg.fsf@gitster.g>
549
+
550
+
551
* jc/rerere-read-rr-fix (2023-07-21) 1 commit
552
. rerere: match the hash algorithm with its length
553
@@ -718,3 +555,50 @@ Release tarballs are available at:
555
556
Superseded by jc/retire-get-sha1-hex
557
source: <xmqqa5vou9ar.fsf@gitster.g>
558
+
559
+
560
+* cb/checkout-same-branch-twice (2023-03-22) 2 commits
561
+ . SQUASH??? the test marked to expect failure passes from day one
562
+ . checkout/switch: disallow checking out same branch in multiple worktrees
563
+
564
+ "git checkout -B $branch" failed to protect against checking out
565
+ a branch that is checked out elsewhere, unlike "git branch -f" did.
566
+
567
+ Have been expecting a hopefully minor and final reroll for too long.
568
+ cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
569
+ source: <20230120113553.24655-1-carenas@gmail.com>
570
+
571
+
572
+* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
573
+ . fsmonitor: handle differences between Windows named pipe functions
574
+
575
+ Fix fsmonitor on Windows when the filesystem path contains certain
576
+ characters.
577
+
578
+ Have been expecting a reroll for too long.
579
+ cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
580
+ source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
581
+
582
+
583
+* rn/sparse-diff-index (2023-04-10) 1 commit
584
+ . diff-index: enable sparse index
585
+
586
+ "git diff-index" command has been taught to work better with the
587
+ sparse index.
588
+
589
+ Have been expecting a reroll for too long.
590
+ cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
591
+ source: <20230408112342.404318-1-nanth.raghul@gmail.com>
592
+
593
+
594
+* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
595
+ . usage: clarify --recurse-submodules as a boolean
596
+
597
+ The "--[no-]recurse-submodules" option of "git checkout" and others
598
+ supported an undocumented syntax --recurse-submodules=<value> where
599
+ the value can spell a Boolean in various ways. The support for the
600
+ syntax is being dropped.
601
+
602
+ Have been expecting a reroll for too long.
603
+ cf. <ZDSTFwMFO7vbj/du@google.com>
604
+ source: <ZDSTFwMFO7vbj/du@google.com>