What's cooking (2023/07 #02)
Junio C Hamano committed
Jul 10, 2023 at 15:54 UTC
350fafa91b0a427950a92a803e28408edeb1fda0
1 file changed
+286
-228
whats-cooking.txt
+286
-228
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2023, #01; Wed, 5)
3
-X-master-at: a646b86cd10282de2ceb64ef33b5412e4fb2a54c
4
-X-next-at: a8219df2e13870c2093740ee0a3038d600051289
2
+Subject: What's cooking in git.git (Jul 2023, #02; Mon, 10)
3
+X-master-at: aa9166bcc0ba654fc21f198a30647ec087f733ed
4
+X-next-at: 4146f391ed560245855fc20b1ea1851409e7b4c8
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2023, #01; Wed, 5)
7
+What's cooking in git.git (Jul 2023, #02; Mon, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,81 +46,265 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[Graduated to 'master']
49
+[New Topics]
50
51
-* bc/more-git-var (2023-06-27) 8 commits
52
- (merged to 'next' on 2023-06-27 at ea14687e91)
53
- + var: add config file locations
54
- + var: add attributes files locations
55
- + attr: expose and rename accessor functions
56
- + var: adjust memory allocation for strings
57
- + var: format variable structure with C99 initializers
58
- + var: add support for listing the shell
59
- + t: add a function to check executable bit
60
- + var: mark unused parameters in git_var callbacks
51
+* ah/advise-force-pushing (2023-07-07) 1 commit
52
+ - push: advise about force-pushing as an alternative to reconciliation
53
62
- Add more "git var" for toolsmiths to learn various locations Git is
63
- configured with either via the configuration or hardcoded defaults.
64
- source: <20230627161902.754472-1-sandals@crustytoothpaste.net>
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
67
-* ps/revision-stdin-with-options (2023-06-15) 3 commits
68
- (merged to 'next' on 2023-06-26 at eda3e4d0b5)
69
- + revision: handle pseudo-opts in `--stdin` mode
70
- + revision: small readability improvement for reading from stdin
71
- + revision: reorder `read_revisions_from_stdin()`
63
73
- The set-up code for the get_revision() API now allows feeding
74
- options like --all and --not in the --stdin mode.
75
- source: <cover.1686839572.git.ps@pks.im>
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
77
---------------------------------------------------
78
-[New Topics]
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
80
-* cw/compat-util-header-cleanup (2023-07-05) 6 commits
81
- - git-compat-util: move alloc macros to git-compat-util.h
82
- - treewide: remove unnecessary includes for wrapper.h
83
- - kwset: move translation table from ctype
84
- - sane-ctype.h: create header for sane-ctype macros
85
- - git-compat-util: move wrapper.c funcs to its header
86
- - git-compat-util: move strbuf.c funcs to its header
73
+ Will merge to 'master'.
74
+ source: <20230707220457.3655121-1-gitster@pobox.com>
75
88
- Further shuffling of declarations across header files to streamline
89
- file dependencies.
76
91
- Will merge to 'next'?
92
- source: <20230705170812.3833103-1-calvinwan@google.com>
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
95
-* jk/imap-send-unused-variable-cleanup (2023-07-05) 3 commits
96
- - imap-send: drop unused fields from imap_cmd_cb
97
- - imap-send: drop unused parameter from imap_cmd_cb callback
98
- - imap-send: use server conf argument in setup_curl()
83
+ Needs review.
84
+ source: <20230707222116.4129415-1-gitster@pobox.com>
85
100
- "imap-send" codepaths got cleaned up to get rid of unused
101
- parameters.
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'.
104
- source: <20230703063247.GA3524302@coredump.intra.peff.net>
123
+ source: <pull.1538.v3.git.1688848614262.gitgitgadget@gmail.com>
124
125
107
-* ma/t0091-fixup (2023-07-05) 1 commit
108
- - t0091-bugreport.sh: actually verify some content of report
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
110
- "git bugreport" tests did not test what it wanted to test, which
111
- has been corrected.
134
+ "git fsck --no-progress" still spewed noise from the commit-graph
135
+ subsystem, which has been corrected.
136
137
Will merge to 'next'.
114
- source: <20230705183532.3057433-1-martin.agren@gmail.com>
138
+ source: <cover.1688776280.git.me@ttaylorr.com>
139
140
117
-* rs/packet-length-simplify (2023-07-04) 1 commit
118
- - pkt-line: don't check string length in packet_length()
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
120
- Code simplification.
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
122
- Will merge to 'next'?
123
- source: <89d58db7-6a01-b3fa-54f0-19d5a3819eb3@web.de>
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>
203
+
204
+
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
208
+
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>
213
+
214
+
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
218
+
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>
308
309
--------------------------------------------------
310
[Stalled]
@@ -259,59 +443,64 @@ Release tarballs are available at:
443
--------------------------------------------------
444
[Cooking]
445
262
-* jk/cherry-pick-revert-status (2023-06-27) 1 commit
263
- (merged to 'next' on 2023-06-28 at 4a0d88ef7a)
264
- + fix cherry-pick/revert status when doing multiple commits
446
+* cw/compat-util-header-cleanup (2023-07-05) 6 commits
447
+ (merged to 'next' on 2023-07-08 at c244b65c4f)
448
+ + git-compat-util: move alloc macros to git-compat-util.h
449
+ + treewide: remove unnecessary includes for wrapper.h
450
+ + kwset: move translation table from ctype
451
+ + sane-ctype.h: create header for sane-ctype macros
452
+ + git-compat-util: move wrapper.c funcs to its header
453
+ + git-compat-util: move strbuf.c funcs to its header
454
266
- During a cherry-pick or revert session that works on multiple
267
- commits, "git status" did not give correct information, which has
268
- been corrected.
455
+ Further shuffling of declarations across header files to streamline
456
+ file dependencies.
457
458
Will merge to 'master'.
271
- source: <20230627224230.1951135-1-jacob.e.keller@intel.com>
459
+ source: <20230705170812.3833103-1-calvinwan@google.com>
460
461
274
-* ks/t4205-test-describe-with-abbrev-fix (2023-06-29) 1 commit
275
- (merged to 'next' on 2023-06-29 at 5fc309dc75)
276
- + t4205: correctly test %(describe:abbrev=...)
462
+* jk/imap-send-unused-variable-cleanup (2023-07-05) 3 commits
463
+ (merged to 'next' on 2023-07-06 at d2798ee0fe)
464
+ + imap-send: drop unused fields from imap_cmd_cb
465
+ + imap-send: drop unused parameter from imap_cmd_cb callback
466
+ + imap-send: use server conf argument in setup_curl()
467
278
- Test update.
468
+ "imap-send" codepaths got cleaned up to get rid of unused
469
+ parameters.
470
471
Will merge to 'master'.
281
- source: <20230629133841.18784-2-five231003@gmail.com>
472
+ source: <20230703063247.GA3524302@coredump.intra.peff.net>
473
474
284
-* jk/fsck-indices-in-worktrees (2023-06-29) 1 commit
285
- (merged to 'next' on 2023-06-29 at 9d245b3681)
286
- + fsck: avoid misleading variable name
475
+* ma/t0091-fixup (2023-07-05) 1 commit
476
+ (merged to 'next' on 2023-07-06 at 3f82b468b4)
477
+ + t0091-bugreport.sh: actually verify some content of report
478
288
- Code clarification.
479
+ "git bugreport" tests did not test what it wanted to test, which
480
+ has been corrected.
481
482
Will merge to 'master'.
291
- source: <20230629181333.87465-1-ericsunshine@charter.net>
483
+ source: <20230705183532.3057433-1-martin.agren@gmail.com>
484
485
294
-* js/empty-index-fixes (2023-06-29) 3 commits
295
- (merged to 'next' on 2023-06-29 at cdfd131900)
296
- + commit -a -m: allow the top-level tree to become empty again
297
- + split-index: accept that a base index can be empty
298
- + do_read_index(): always mark index as initialized unless erroring out
486
+* rs/packet-length-simplify (2023-07-07) 1 commit
487
+ (merged to 'next' on 2023-07-08 at 7f4b52e75b)
488
+ + pkt-line: add size parameter to packet_length()
489
300
- A few places failed to differenciate the case where the index is
301
- truly empty (nothing added) and we haven't yet read from the
302
- on-disk index file, which have been corrected.
490
+ Code simplification.
491
492
Will merge to 'master'.
305
- source: <pull.1554.git.1688044991.gitgitgadget@gmail.com>
493
+ source: <4d2bb49b-9c3c-ea58-274b-d9e9586620c1@web.de>
494
495
496
* vd/adjust-mfow-doc-to-updated-headers (2023-07-04) 1 commit
309
- - docs: add necessary headers to Documentation/MFOW.txt
497
+ (merged to 'next' on 2023-07-08 at 38103c697d)
498
+ + docs: add necessary headers to Documentation/MFOW.txt
499
500
Code snippets in a tutorial document no longer compiled after
501
recent header shuffling, which have been corrected.
502
314
- Will merge to 'next'?
503
+ Will merge to 'master'.
504
source: <20230702151457.3227-1-vinayakdev.sci@gmail.com>
505
506
@@ -323,70 +512,19 @@ Release tarballs are available at:
512
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
513
514
326
-* gc/config-context (2023-06-28) 11 commits
327
- (merged to 'next' on 2023-06-28 at 38632f3daf)
328
- + config: pass source to config_parser_event_fn_t
329
- + config: add kvi.path, use it to evaluate includes
330
- + config.c: remove config_reader from configsets
331
- + config: pass kvi to die_bad_number()
332
- + trace2: plumb config kvi
333
- + config.c: pass ctx with CLI config
334
- + config: pass ctx with config files
335
- + config.c: pass ctx in configsets
336
- + config: add ctx arg to config_fn_t
337
- + urlmatch.h: use config_fn_t type
338
- + config: inline git_color_default_config
339
-
340
- Reduce reliance on a global state in the config reading API.
341
-
342
- Will merge to 'master'.
343
- source: <pull.1497.v5.git.git.1687980390.gitgitgadget@gmail.com>
344
-
345
-
346
-* gc/config-partial-submodule-kvi-fix (2023-06-26) 1 commit
347
- (merged to 'next' on 2023-06-28 at 1fb30a34e3)
348
- + config: don't BUG when both kvi and source are set
349
-
350
- Partially revert a sanity check that the rest of the config code
351
- was not ready, to avoid triggering it in a corner case.
352
-
353
- Will merge to 'master'.
354
- source: <pull.1535.git.git.1687801297404.gitgitgadget@gmail.com>
355
-
356
-
357
-* pw/apply-too-large (2023-06-26) 1 commit
358
- (merged to 'next' on 2023-06-28 at c0460d682c)
359
- + apply: improve error messages when reading patch
360
-
361
- "git apply" punts when it is fed too large a patch input; the error
362
- message it gives when it happens has been clarified.
363
-
364
- Will merge to 'master'.
365
- source: <pull.1552.git.1687772253869.gitgitgadget@gmail.com>
366
-
367
-
515
* pw/diff-no-index-from-named-pipes (2023-07-05) 4 commits
369
- - diff --no-index: support reading from named pipes
370
- - t4054: test diff --no-index with stdin
371
- - diff --no-index: die on error reading stdin
372
- - diff --no-index: refuse to compare stdin to a directory
516
+ (merged to 'next' on 2023-07-08 at 225230a441)
517
+ + diff --no-index: support reading from named pipes
518
+ + t4054: test diff --no-index with stdin
519
+ + diff --no-index: die on error reading stdin
520
+ + diff --no-index: refuse to compare stdin to a directory
521
522
"git diff --no-index" learned to read from named pipes as if they
523
were regular files, to allow "git diff <(process) <(substitution)"
524
some shells support.
525
378
- Will merge to 'next'.
379
- source: <cover.1688586536.git.phillip.wood@dunelm.org.uk>
380
-
381
-
382
-* jc/doc-hash-object-types (2023-06-28) 1 commit
383
- (merged to 'next' on 2023-06-28 at adff1700c2)
384
- + docs: add git hash-object -t option's possible values
385
-
386
- Doc update.
387
-
526
Will merge to 'master'.
389
- source: <pull.1533.v3.git.git.1688004473941.gitgitgadget@gmail.com>
527
+ source: <cover.1688586536.git.phillip.wood@dunelm.org.uk>
528
529
530
* cc/repack-sift-filtered-objects-to-separate-pack (2023-07-05) 8 commits
@@ -407,20 +545,6 @@ Release tarballs are available at:
545
source: <20230705060812.2865188-1-christian.couder@gmail.com>
546
547
410
-* rs/strbuf-expand-step (2023-06-18) 5 commits
411
- (merged to 'next' on 2023-06-28 at 1918915b71)
412
- + strbuf: simplify strbuf_expand_literal_cb()
413
- + replace strbuf_expand() with strbuf_expand_step()
414
- + replace strbuf_expand_dict_cb() with strbuf_expand_step()
415
- + strbuf: factor out strbuf_expand_step()
416
- + pretty: factor out expand_separator()
417
-
418
- Code clean-up around strbuf_expand() API.
419
-
420
- Will merge to 'master'.
421
- source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
422
-
423
-
548
* js/doc-unit-tests (2023-06-30) 1 commit
549
- unit tests: Add a project plan document
550
@@ -442,47 +566,15 @@ Release tarballs are available at:
566
source: <20230604211934.1365289-1-mh@glandium.org>
567
568
445
-* pb/complete-diff-options (2023-06-26) 24 commits
446
- (merged to 'next' on 2023-06-28 at ccff93557d)
447
- + diff.c: mention completion above add_diff_options
448
- + completion: complete --remerge-diff
449
- + completion: complete --diff-merges, its options and --no-diff-merges
450
- + completion: move --pickaxe-{all,regex} to __git_diff_common_options
451
- + completion: complete --ws-error-highlight
452
- + completion: complete --unified
453
- + completion: complete --output-indicator-{context,new,old}
454
- + completion: complete --output
455
- + completion: complete --no-stat
456
- + completion: complete --no-relative
457
- + completion: complete --line-prefix
458
- + completion: complete --ita-invisible-in-index and --ita-visible-in-index
459
- + completion: complete --irreversible-delete
460
- + completion: complete --ignore-matching-lines
461
- + completion: complete --function-context
462
- + completion: complete --find-renames
463
- + completion: complete --find-object
464
- + completion: complete --find-copies
465
- + completion: complete --default-prefix
466
- + completion: complete --compact-summary
467
- + completion: complete --combined-all-paths
468
- + completion: complete --cc
469
- + completion: complete --break-rewrites
470
- + completion: add comments describing __git_diff_* globals
471
-
472
- Completion updates.
473
-
474
- Will merge to 'master'.
475
- source: <pull.1543.v3.git.1687796688.gitgitgadget@gmail.com>
476
-
477
-
569
* ks/ref-filter-signature (2023-06-06) 2 commits
479
- - ref-filter: add new "signature" atom
480
- - t/lib-gpg: introduce new prereq GPG2
570
+ (merged to 'next' on 2023-07-06 at 1748d2bb93)
571
+ + ref-filter: add new "signature" atom
572
+ + t/lib-gpg: introduce new prereq GPG2
573
574
The "git for-each-ref" family of commands learned placeholders
575
related to GPG signature verification.
576
485
- Will merge to 'next'.
577
+ Will merge to 'master'.
578
cf. <CAP8UFD1CfUm+9PTXO0wBBdBs0U=YVte+EiPbDyUyg7T152aw2g@mail.gmail.com>
579
source: <20230604185815.15761-1-five231003@gmail.com>
580
@@ -525,12 +617,12 @@ Release tarballs are available at:
617
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
618
619
528
-* tb/refs-exclusion-and-packed-refs (2023-06-20) 16 commits
620
+* 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
533
- - refs/packed-backend.c: ignore complicated hidden refs rules
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)
@@ -547,7 +639,7 @@ Release tarballs are available at:
639
match certain patterns, has been optimized.
640
641
Under discussion.
550
- source: <cover.1687270849.git.me@ttaylorr.com>
642
+ source: <cover.1689023520.git.me@ttaylorr.com>
643
644
645
* cc/git-replay (2023-06-03) 15 commits
@@ -581,40 +673,6 @@ Release tarballs are available at:
673
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
674
675
584
-* cw/strbuf-cleanup (2023-06-12) 7 commits
585
- (merged to 'next' on 2023-06-28 at c158b004a8)
586
- + strbuf: remove global variable
587
- + path: move related function to path
588
- + object-name: move related functions to object-name
589
- + credential-store: move related functions to credential-store file
590
- + abspath: move related functions to abspath
591
- + strbuf: clarify dependency
592
- + strbuf: clarify API boundary
593
-
594
- Move functions that are not about pure string manipulation out of
595
- strbuf.[ch]
596
-
597
- Will merge to 'master'.
598
- source: <20230606194720.2053551-1-calvinwan@google.com>
599
-
600
-
601
-* tl/notes-separator (2023-06-21) 7 commits
602
- (merged to 'next' on 2023-06-28 at 74fa459f4d)
603
- + notes: introduce "--no-separator" option
604
- + notes.c: introduce "--[no-]stripspace" option
605
- + notes.c: append separator instead of insert by pos
606
- + notes.c: introduce '--separator=<paragraph-break>' option
607
- + t3321: add test cases about the notes stripspace behavior
608
- + notes.c: use designated initializers for clarity
609
- + notes.c: cleanup 'strbuf_grow' call in 'append_edit'
610
-
611
- 'git notes append' was taught '--separator' to specify string to insert
612
- between paragraphs.
613
-
614
- Will merge to 'master'.
615
- source: <cover.1685174011.git.dyroneteng@gmail.com>
616
-
617
-
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