What's cooking (2023/01 #07)
Junio C Hamano committed
Jan 26, 2023 at 13:20 UTC
033374742921f9a142ae989c4c4a0b68fd6557c7
1 file changed
+390
-508
whats-cooking.txt
+390
-508
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2023, #06; Sun, 22)
3
-X-master-at: 56c8fb1e95377900ec9d53c07886022af0a5d3c2
4
-X-next-at: fc5497dd1b1018e63e916d3ef950ac3f70ea090d
2
+Subject: What's cooking in git.git (Jan 2023, #07; Thu, 26)
3
+X-master-at: 5dec958dcf965fc75e0f459f8e8ccf9c9f495b15
4
+X-next-at: 140f2c2c60f2ff502a86a78405724f6276de87bb
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2023, #06; Sun, 22)
7
+What's cooking in git.git (Jan 2023, #07; Thu, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,394 +45,195 @@ Release tarballs are available at:
45
--------------------------------------------------
46
[Graduated to 'master']
47
48
-* ab/bisect-cleanup (2023-01-13) 6 commits
49
- (merged to 'next' on 2023-01-14 at 945b631a1e)
50
- + bisect: no longer try to clean up left-over `.git/head-name` files
51
- + bisect: remove Cogito-related code
52
- + bisect run: fix the error message
53
- + bisect: verify that a bogus option won't try to start a bisection
54
- + bisect--helper: make the order consistently `argc, argv`
55
- + bisect--helper: simplify exit code computation
56
-
57
- Code clean-up.
58
- source: <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
59
-
60
-
61
-* ar/bisect-doc-update (2023-01-13) 2 commits
62
- (merged to 'next' on 2023-01-14 at df5185519c)
63
- + git-bisect-lk2009: update nist report link
64
- + git-bisect-lk2009: update java code conventions link
65
-
66
- Doc update.
67
- source: <20230110093251.193552-1-rybak.a.v@gmail.com>
68
-
69
-
70
-* ar/test-cleanup (2023-01-13) 3 commits
71
- (merged to 'next' on 2023-01-14 at 16d372b65d)
72
- + t7527: use test_when_finished in 'case insensitive+preserving'
73
- + t6422: drop commented out code
74
- + t6003: uncomment test '--max-age=c3, --topo-order'
75
-
76
- Test clean-up.
77
- source: <20230111233242.16870-1-rybak.a.v@gmail.com>
78
-
79
-
80
-* es/hooks-and-local-env (2023-01-13) 1 commit
81
- (merged to 'next' on 2023-01-14 at 93acd89393)
82
- + githooks: discuss Git operations in foreign repositories
83
-
84
- Doc update for environment variables set when hooks are invoked.
85
- source: <pull.1457.v2.git.1673293508399.gitgitgadget@gmail.com>
86
-
87
-
88
-* jc/doc-diff-patch.txt (2023-01-13) 1 commit
89
- (merged to 'next' on 2023-01-14 at d25ec1f631)
90
- + docs: link generating patch sections
91
-
92
- Doc update.
93
- source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
94
-
95
-
96
-* jk/curl-avoid-deprecated-api (2023-01-17) 3 commits
97
- (merged to 'next' on 2023-01-17 at e3ead5f8a0)
98
- + http: support CURLOPT_PROTOCOLS_STR
99
- + http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
100
- + http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
101
-
102
- Deal with a few deprecation warning from cURL library.
103
- source: <Y8YP+R/hyNr6sEFA@coredump.intra.peff.net>
104
-
105
-
106
-* jk/interop-error (2023-01-13) 1 commit
107
- (merged to 'next' on 2023-01-14 at ddca7887a5)
108
- + t/interop: report which vanilla git command failed
109
-
110
- Test helper improvement.
111
- source: <Y8A3yGeJl0TCDNqe@coredump.intra.peff.net>
112
-
113
-
114
-* jk/read-object-cleanup (2023-01-13) 6 commits
115
- (merged to 'next' on 2023-01-13 at 8cbeef4abd)
116
- + object-file: fix indent-with-space
117
- (merged to 'next' on 2023-01-09 at 19cc3de33e)
118
- + packfile: inline custom read_object()
119
- + repo_read_object_file(): stop wrapping read_object_file_extended()
120
- + read_object_file_extended(): drop lookup_replace option
121
- + streaming: inline call to read_object_file_extended()
122
- + object-file: inline calls to read_object()
48
+* ab/cache-api-cleanup (2023-01-16) 5 commits
49
+ (merged to 'next' on 2023-01-16 at a0f388b149)
50
+ + cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
51
+ + read-cache.c: refactor set_new_index_sparsity() for subsequent commit
52
+ + sparse-index API: BUG() out on NULL ensure_full_index()
53
+ + sparse-index.c: expand_to_path() can assume non-NULL "istate"
54
+ + builtin/difftool.c: { 0 }-initialize rather than using memset()
55
+ (this branch is used by ab/cache-api-cleanup-users.)
56
124
- Code clean-up.
125
- source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
57
+ Code clean-up to tighten the use of in-core index in the API.
58
+ source: <cover-v2-0.6-00000000000-20230112T124842Z-avarab@gmail.com>
59
60
128
-* jx/t1301-updates (2022-11-30) 3 commits
129
- (merged to 'next' on 2023-01-14 at d4f081b3f8)
130
- + t1301: do not change $CWD in "shared=all" test case
131
- + t1301: use test_when_finished for cleanup
132
- + t1301: fix wrong template dir for git-init
61
+* ab/test-env-helper (2023-01-14) 1 commit
62
+ (merged to 'next' on 2023-01-16 at 82c17f02e5)
63
+ + env-helper: move this built-in to "test-tool env-helper"
64
134
- Test updates.
135
- source: <20221128130323.8914-1-worldhello.net@gmail.com>
65
+ Remove "git env--helper" and demote it to a test-tool subcommand.
66
+ source: <patch-1.1-e662c570f1d-20230112T155226Z-avarab@gmail.com>
67
68
138
-* pb/doc-orig-head (2023-01-13) 5 commits
139
- (merged to 'next' on 2023-01-14 at 0583c146cb)
140
- + git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
141
- + revisions.txt: be explicit about commands writing 'ORIG_HEAD'
142
- + git-merge.txt: mention 'ORIG_HEAD' in the Description
143
- + git-reset.txt: mention 'ORIG_HEAD' in the Description
144
- + git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
69
+* ds/omit-trailing-hash-in-index (2023-01-17) 1 commit
70
+ (merged to 'next' on 2023-01-17 at 8dde3cf2db)
71
+ + t1600: fix racy index.skipHash test
72
+ (this branch is used by ab/cache-api-cleanup-users.)
73
146
- Document ORIG_HEAD a bit more.
147
- source: <pull.1456.v2.git.1673356521.gitgitgadget@gmail.com>
74
+ Quickfix for a topic already in 'master'.
75
+ source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
76
77
150
-* ph/parse-date-reduced-precision (2023-01-13) 1 commit
151
- (merged to 'next' on 2023-01-14 at eb83564c3e)
152
- + date.c: allow ISO 8601 reduced precision times
78
+* en/t6426-todo-cleanup (2023-01-14) 1 commit
79
+ (merged to 'next' on 2023-01-16 at 7d13842eeb)
80
+ + t6426: fix TODO about making test more comprehensive
81
154
- Loosen date parsing heuristics.
155
- source: <20230111001003.10916-1-congdanhqx@gmail.com>
82
+ Test clean-up.
83
+ source: <pull.1462.v2.git.1673722187025.gitgitgadget@gmail.com>
84
85
158
-* pw/rebase-exec-cleanup (2023-01-13) 1 commit
159
- (merged to 'next' on 2023-01-14 at 553d0daa62)
160
- + rebase: cleanup "--exec" option handling
86
+* jc/format-patch-v-unleak (2023-01-16) 1 commit
87
+ (merged to 'next' on 2023-01-16 at 2155d512bc)
88
+ + format-patch: unleak "-v <num>"
89
162
- Code clean-up.
163
- source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
90
+ Plug a small leak.
91
+ source: <xmqqv8l8gr6s.fsf@gitster.g>
92
93
166
-* rs/dup-array (2023-01-09) 5 commits
167
- (merged to 'next' on 2023-01-14 at 3efbd1ffe0)
168
- + use DUP_ARRAY
169
- + add DUP_ARRAY
170
- + do full type check in BARF_UNLESS_COPYABLE
171
- + factor out BARF_UNLESS_COPYABLE
172
- + mingw: make argv2 in try_shell_exec() non-const
94
+* kn/attr-from-tree (2023-01-14) 2 commits
95
+ (merged to 'next' on 2023-01-16 at 426f357683)
96
+ + attr: add flag `--source` to work with tree-ish
97
+ + t0003: move setup for `--all` into new block
98
174
- Code cleaning.
175
- source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
176
- source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
99
+ "git check-attr" learned to take an optional tree-ish to read the
100
+ .gitattributes file from.
101
+ source: <cover.1673684790.git.karthik.188@gmail.com>
102
103
179
-* sk/merge-filtering-strategies-micro-optim (2023-01-13) 1 commit
180
- (merged to 'next' on 2023-01-14 at f171559fae)
181
- + merge: break out of all_strategy loop when strategy is found
104
+* rs/ls-tree-path-expansion-fix (2023-01-14) 2 commits
105
+ (merged to 'next' on 2023-01-16 at 6359f28ba7)
106
+ + ls-tree: remove dead store and strbuf for quote_c_style()
107
+ + ls-tree: fix expansion of repeated %(path)
108
183
- Micro optimization.
184
- source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
109
+ "git ls-tree --format='%(path) %(path)' $tree $path" showed the
110
+ path three times, which has been corrected.
111
+ source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
112
113
187
-* tl/ls-tree-code-clean-up (2023-01-13) 6 commits
188
- (merged to 'next' on 2023-01-14 at f7238037fd)
189
- + t3104: remove shift code in 'test_ls_tree_format'
190
- + ls-tree: cleanup the redundant SPACE
191
- + ls-tree: make "line_termination" less generic
192
- + ls-tree: fold "show_tree_data" into "cb" struct
193
- + ls-tree: use a "struct options"
194
- + ls-tree: don't use "show_tree_data" for "fast" callbacks
114
+* rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
115
+ (merged to 'next' on 2023-01-16 at 9b80d4253f)
116
+ + use enhanced basic regular expressions on macOS
117
196
- Code clean-up.
197
- source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
118
+ Newer regex library macOS stopped enabling GNU-like enhanced BRE,
119
+ where '\(A\|B\)' works as alternation, unless explicitly asked with
120
+ the REG_ENHANCED flag. "git grep" now can be compiled to do so, to
121
+ retain the old behaviour.
122
+ source: <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
123
124
200
-* yc/doc-fetch-fix (2023-01-13) 1 commit
201
- (merged to 'next' on 2023-01-14 at a3ca60840b)
202
- + doc: fix non-existent config name
125
+* sk/win32-close-handle-upon-pthread-join (2023-01-04) 2 commits
126
+ (merged to 'next' on 2023-01-16 at faa279fd5b)
127
+ + win32: close handles of threads that have been joined
128
+ + win32: prepare pthread.c for change by formatting
129
204
- Doc fix.
205
- source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
130
+ Pthread emulation on Win32 leaked thread handle when a thread is
131
+ joined.
132
+ source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
133
134
208
-* yo/doc-use-more-switch-c (2023-01-13) 1 commit
209
- (merged to 'next' on 2023-01-14 at 7169d5dabc)
210
- + doc: add "git switch -c" as another option on detached HEAD
135
+* zh/scalar-progress (2023-01-16) 1 commit
136
+ (merged to 'next' on 2023-01-17 at d4c25cc71f)
137
+ + scalar: show progress if stderr refers to a terminal
138
212
- Doc update.
213
- source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
139
+ "scalar" learned to give progress bar.
140
+ source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
141
142
--------------------------------------------------
143
[New Topics]
144
218
-* ab/cache-api-cleanup-users (2023-01-17) 3 commits
219
- (merged to 'next' on 2023-01-18 at c5a4374652)
220
- + treewide: always have a valid "index_state.repo" member
221
- + Merge branch 'ds/omit-trailing-hash-in-index' into ab/cache-api-cleanup-users
222
- + Merge branch 'ab/cache-api-cleanup' into ab/cache-api-cleanup-users
223
- (this branch uses ab/cache-api-cleanup and ds/omit-trailing-hash-in-index.)
145
+* ar/markup-em-dash (2023-01-23) 1 commit
146
+ (merged to 'next' on 2023-01-24 at 0367e3035f)
147
+ + Documentation: render dash correctly
148
225
- Updates the users of the cache API.
149
+ Doc mark-up updates.
150
151
Will merge to 'master'.
228
- cf. <db312853-81a1-542b-db96-d816c463516c@github.com>
229
- source: <patch-1.1-b4998652822-20230117T135234Z-avarab@gmail.com>
152
+ source: <20230123090114.429844-1-rybak.a.v@gmail.com>
153
154
232
-* cb/checkout-same-branch-twice (2023-01-20) 1 commit
233
- - checkout/switch: disallow checking out same branch in multiple worktrees
234
-
235
- "git checkout -B $branch" failed to protect against checking out
236
- a branch that is checked out elsewhere, unlike "git branch -f" did.
237
-
238
- Expecting a (hopefully final) reroll.
239
- cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk>
240
- source: <20230120113553.24655-1-carenas@gmail.com>
241
-
242
-
243
-* sa/cat-file-mailmap--batch-check (2023-01-18) 1 commit
244
- (merged to 'next' on 2023-01-18 at 25ecb1dd3a)
245
- + git-cat-file.txt: fix list continuations rendering literally
155
+* ab/hook-api-with-stdin (2023-01-23) 5 commits
156
+ - hook: support a --to-stdin=<path> option for testing
157
+ - sequencer: use the new hook API for the simpler "post-rewrite" call
158
+ - hook API: support passing stdin to hooks, convert am's 'post-rewrite'
159
+ - run-command: allow stdin for run_processes_parallel
160
+ - run-command.c: remove dead assignment in while-loop
161
247
- Docfix.
162
+ Extend the run-hooks API to allow feeding data from the standard
163
+ input when running the hook script(s).
164
249
- Will merge to 'master'.
250
- source: <20230118082749.1252459-1-martin.agren@gmail.com>
165
+ Expecting review responses.
166
+ source: <cover-0.5-00000000000-20230123T170550Z-avarab@gmail.com>
167
168
253
-* pb/branch-advice-recurse-submodules (2023-01-18) 1 commit
254
- (merged to 'next' on 2023-01-19 at 13747fc72d)
255
- + branch: improve advice when --recurse-submodules fails
169
+* as/ssh-signing-improve-key-missing-error (2023-01-25) 1 commit
170
+ (merged to 'next' on 2023-01-25 at 140f2c2c60)
171
+ + ssh signing: better error message when key not in agent
172
257
- Improve advice message given when "git branch --resurse-submodules"
258
- fails.
173
+ Improve the error message given when private key is not loaded in
174
+ the ssh agent in the codepath to sign with an ssh key.
175
176
Will merge to 'master'.
261
- source: <pull.1464.git.1673890908453.gitgitgadget@gmail.com>
262
-
263
-
264
-* ab/sequencer-unleak (2023-01-18) 8 commits
265
- - commit.c: free() revs.commit in get_fork_point()
266
- - builtin/rebase.c: free() "options.strategy_opts"
267
- - sequencer.c: always free() the "msgbuf" in do_pick_commit()
268
- - builtin/rebase.c: fix "options.onto_name" leak
269
- - builtin/revert.c: move free-ing of "revs" to replay_opts_release()
270
- - rebase & sequencer API: fix get_replay_opts() leak in "rebase"
271
- - sequencer.c: split up sequencer_remove_state()
272
- - rebase: use "cleanup" pattern in do_interactive_rebase()
273
-
274
- Plug leaks in sequencer subsystem and its users.
275
-
276
- Needs review.
277
- source: <cover-v3-0.8-00000000000-20230118T160600Z-avarab@gmail.com>
177
+ source: <pull.1270.v3.git.git.1674650450662.gitgitgadget@gmail.com>
178
179
280
-* en/rebase-update-refs-needs-merge-backend (2023-01-22) 9 commits
180
+* en/rebase-incompatible-opts (2023-01-25) 10 commits
181
- rebase: provide better error message for apply options vs. merge config
182
- rebase: put rebase_options initialization in single place
183
- rebase: fix formatting of rebase --reapply-cherry-picks option in docs
184
- rebase: clarify the OPT_CMDMODE incompatibilities
185
- rebase: add coverage of other incompatible options
186
+ - rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks
187
- rebase: fix docs about incompatibilities with --root
188
- rebase: remove --allow-empty-message from incompatible opts
189
- rebase: flag --apply and --merge as incompatible
190
- rebase: mark --update-refs as requiring the merge backend
191
291
- The "--update-refs" feature of "git rebase" requires the use of the
292
- merge backend, while "--whitespace=fix" feature does not work with
293
- the said backend. Notice the combination and error out, instead of
294
- silently ignoring one of the features requested.
295
-
296
- Needs review.
297
- source: <pull.1466.v4.git.1674367961.gitgitgadget@gmail.com>
298
-
299
-
300
-* jk/hash-object-literally-fd-leak (2023-01-19) 1 commit
301
- (merged to 'next' on 2023-01-19 at fff9b60a36)
302
- + hash-object: fix descriptor leak with --literally
303
-
304
- Leakfix.
305
-
306
- Will merge to 'master'.
307
- source: <Y8ijpJqtkDTi792i@coredump.intra.peff.net>
308
-
309
-
310
-* jc/doc-branch-update-checked-out-branch (2023-01-18) 1 commit
311
- (merged to 'next' on 2023-01-19 at 970900a232)
312
- + branch: document `-f` and linked worktree behaviour
313
-
314
- Document that "branch -f <branch>" disables only the safety to
315
- avoid recreating an existing branch.
316
-
317
- Will merge to 'master'.
318
- source: <xmqqa62f2dj1.fsf_-_@gitster.g>
319
-
320
-
321
-* jc/doc-checkout-b (2023-01-19) 1 commit
322
- - checkout: document -b/-B to highlight the differences from "git branch"
323
-
324
- Clarify how "checkout -b/-B" and "git branch [-f]" are similar but
325
- different in the documentation.
326
-
327
- Will merge to 'next'.
328
- source: <xmqqtu0m1m9i.fsf@gitster.g>
329
-
330
-
331
-* cw/fetch-remote-group-with-duplication (2023-01-19) 1 commit
332
- (merged to 'next' on 2023-01-20 at 7f00e43209)
333
- + fetch: fix duplicate remote parallel fetch bug
334
-
335
- "git fetch <group>", when "<group>" of remotes lists the same
336
- remote twice, unnecessarily failed when parallel fetching was
337
- enabled, which has been corrected.
338
-
339
- Will merge to 'master'.
340
- source: <20230119220538.1522464-1-calvinwan@google.com>
341
-
342
-
343
-* po/pretty-format-columns-doc (2023-01-19) 5 commits
344
- - doc: pretty-formats note wide char limitations, and add tests
345
- - doc: pretty-formats describe use of ellipsis in truncation
346
- - doc: pretty-formats document negative column alignments
347
- - doc: pretty-formats: delineate `%<|(` parameter values
348
- - doc: pretty-formats: separate parameters from placeholders
349
-
350
- Clarify column-padding operators in the pretty format string.
351
-
352
- Will merge to 'next'.
353
- source: <20230119181827.1319-1-philipoakley@iee.email>
354
-
355
-
356
-* jk/hash-object-fsck (2023-01-19) 7 commits
357
- - fsck: do not assume NUL-termination of buffers
358
- - hash-object: use fsck for object checks
359
- - fsck: provide a function to fsck buffer without object struct
360
- - t: use hash-object --literally when created malformed objects
361
- - t7030: stop using invalid tag name
362
- - t1006: stop using 0-padded timestamps
363
- - t1007: modernize malformed object tests
364
-
365
- "git hash-object" now checks that the resulting object is well
366
- formed with the same code as "git fsck".
367
-
368
- Will merge to 'next'.
369
- source: <Y8hX+pIZUKXsyYj5@coredump.intra.peff.net>
370
- source: <Y8ifa7hyqxSbL92U@coredump.intra.peff.net>
371
-
372
-
373
-* rs/tree-parse-mode-overflow-check (2023-01-21) 1 commit
374
- - tree-walk: disallow overflowing modes
375
-
376
- Reject tree objects with entries whose mode bits are overly wide.
377
-
378
- Will merge to 'next'.
379
- source: <d673fde7-7eb2-6306-86b6-1c1a4c988ee8@web.de>
380
-
381
-
382
-* tb/t0003-invoke-dd-more-portably (2023-01-22) 1 commit
383
- - t0003: call dd with portable blocksize
384
-
385
- Test portability fix.
386
-
387
- Will merge to 'next'.
388
- source: <20230122062839.14542-1-tboegi@web.de>
389
-
390
-
391
-* ar/markup-em-en-dash (2023-01-22) 1 commit
392
- - Documentation: render dash correctly
393
-
394
- Doc mark-up fix.
192
+ "git rebase" often ignored incompatible options instead of
193
+ complaining, which has been corrected.
194
195
Will merge to 'next'.
397
- source: <20230122165628.1601062-1-rybak.a.v@gmail.com>
196
+ Replaces en/rebase-update-refs-needs-merge-backend.
197
+ source: <pull.1466.v5.git.1674619434.gitgitgadget@gmail.com>
198
199
400
-* jc/attr-doc-fix (2023-01-22) 1 commit
401
- - attr: fix instructions on how to check attrs
402
-
403
- Comment fix.
200
+* gm/request-pull-with-non-pgp-signed-tags (2023-01-25) 1 commit
201
+ - request-pull: filter out SSH/X.509 tag signatures
202
405
- Will merge to 'next'.
406
- source: <pull.1441.git.git.1674356774172.gitgitgadget@gmail.com>
203
+ source: <20230125234725.3918563-1-gwymor@tilde.club>
204
205
+--------------------------------------------------
206
+[Stalled]
207
409
-* rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits
410
- - switch: reject if the branch is already checked out elsewhere (test)
411
- - rebase: refuse to switch to a branch already checked out elsewhere (test)
412
- - branch: fix die_if_checked_out() when ignore_current_worktree
208
+* ja/worktree-orphan (2023-01-13) 4 commits
209
+ - worktree add: add hint to direct users towards --orphan
210
+ - worktree add: add --orphan flag
211
+ - worktree add: refactor opt exclusion tests
212
+ - worktree add: include -B in usage docs
213
414
- A few subcommands have been taught to stop users from working on a
415
- branch that is being used in another worktree linked to the same
416
- repository.
214
+ 'git worktree add' learned how to create a worktree based on an
215
+ orphaned branch with `--orphan`.
216
418
- Expecting a (hopefully final) reroll.
419
- cf. <d61a2393-64c8-da49-fe13-00bc4a52d5e3@gmail.com>
420
- source: <f7f45f54-9261-45ea-3399-8ba8dee6832b@gmail.com>
217
+ Expecting a reroll.
218
+ cf. <11be1b0e-ee38-119f-1d80-cb818946116b@dunelm.org.uk>
219
+ source: <20230109173227.29264-1-jacobabel@nullpo.dev>
220
221
423
-* rj/bisect-already-used-branch (2023-01-22) 1 commit
424
- - bisect: fix "reset" when branch is checked out elsewhere
222
+* ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
223
+ - tests: don't lose misc "git" exit codes
224
+ - tests: don't lose "git" exit codes in "! ( git ... | grep )"
225
+ - tests: don't lose exit status with "test <op> $(git ...)"
226
+ - tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
227
+ - t/lib-patch-mode.sh: fix ignored exit codes
228
+ - auto-crlf tests: don't lose exit code in loops and outside tests
229
426
- Allow "git bisect reset [name]" to check out the named branch (or
427
- the original one) even when the branch is already checked out in a
428
- different worktree linked to the same repository.
230
+ Test clean-up.
231
430
- Leaning negative. Why is it a good thing?
431
- cf. <xmqqo7qqovp1.fsf@gitster.g>
432
- source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
232
+ Expecting a hopefully minor and final reroll.
233
+ cf. <1182283a-4a78-3c99-e716-a8c3e58a5823@web.de>
234
+ cf. <xmqqsfhb0vum.fsf@gitster.g>
235
+ source: <cover-v4-0.6-00000000000-20221219T101240Z-avarab@gmail.com>
236
434
---------------------------------------------------
435
-[Stalled]
237
238
* tl/notes--blankline (2022-11-09) 5 commits
239
- notes.c: introduce "--no-blank-line" option
@@ -510,114 +311,240 @@ Release tarballs are available at:
311
- fsmonitor: determine if filesystem is local or remote
312
- fsmonitor: prepare to share code between Mac OS and Linux
313
513
- Bundled fsmonitor for Linux using inotify API.
314
+ Bundled fsmonitor for Linux using inotify API.
315
+
316
+ Needs review on the updated round.
317
+ source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
318
+
319
+
320
+* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit
321
+ - e-mail workflow: Message-ID is spelled with ID in both capital letters
322
+
323
+ Consistently spell "Message-ID" as such, not "Message-Id".
324
+
325
+ Needs review.
326
+ source: <xmqqsfhgnmqg.fsf@gitster.g>
327
+
328
+
329
+* cb/grep-fallback-failing-jit (2022-12-17) 1 commit
330
+ - grep: fall back to interpreter mode if JIT fails
331
+
332
+ In an environment where dynamically generated code is prohibited to
333
+ run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
334
+ back to interpreted execution in such a case.
335
+
336
+ Expecting a reroll.
337
+ cf. <f680b274-fa85-6624-096a-7753a2671c15@grsecurity.net>
338
+ source: <20221216121557.30714-1-minipli@grsecurity.net>
339
+
340
+
341
+* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
342
+ - test-lib: allow storing counts with test harnesses
343
+
344
+ Allow summary results from tests to be written to t/test-results
345
+ directory even when a test harness like 'prove' is in use.
346
+
347
+ Needs review.
348
+ source: <20221224225200.1027806-1-adam@dinwoodie.org>
349
+
350
+
351
+* so/diff-merges-more (2022-12-18) 5 commits
352
+ - diff-merges: improve --diff-merges documentation
353
+ - diff-merges: issue warning on lone '-m' option
354
+ - diff-merges: support list of values for --diff-merges
355
+ - diff-merges: implement log.diffMerges-m-imply-p config
356
+ - diff-merges: implement [no-]hide option and log.diffMergesHide config
357
+
358
+ Assorted updates to "--diff-merges=X" option.
359
+
360
+ May want to discard. Breaking compatibility does not seem worth it.
361
+ source: <20221217132955.108542-1-sorganov@gmail.com>
362
+
363
+--------------------------------------------------
364
+[Cooking]
365
+
366
+* ab/cache-api-cleanup-users (2023-01-17) 3 commits
367
+ (merged to 'next' on 2023-01-18 at c5a4374652)
368
+ + treewide: always have a valid "index_state.repo" member
369
+ + Merge branch 'ds/omit-trailing-hash-in-index' into ab/cache-api-cleanup-users
370
+ + Merge branch 'ab/cache-api-cleanup' into ab/cache-api-cleanup-users
371
+
372
+ Updates the users of the cache API.
373
+
374
+ Will merge to 'master'.
375
+ cf. <db312853-81a1-542b-db96-d816c463516c@github.com>
376
+ source: <patch-1.1-b4998652822-20230117T135234Z-avarab@gmail.com>
377
+
378
+
379
+* cb/checkout-same-branch-twice (2023-01-20) 1 commit
380
+ - checkout/switch: disallow checking out same branch in multiple worktrees
381
+
382
+ "git checkout -B $branch" failed to protect against checking out
383
+ a branch that is checked out elsewhere, unlike "git branch -f" did.
384
+
385
+ Expecting a (hopefully final) reroll.
386
+ cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk>
387
+ source: <20230120113553.24655-1-carenas@gmail.com>
388
+
389
+
390
+* sa/cat-file-mailmap--batch-check (2023-01-18) 1 commit
391
+ (merged to 'next' on 2023-01-18 at 25ecb1dd3a)
392
+ + git-cat-file.txt: fix list continuations rendering literally
393
+
394
+ Docfix.
395
+
396
+ Will merge to 'master'.
397
+ source: <20230118082749.1252459-1-martin.agren@gmail.com>
398
+
399
+
400
+* pb/branch-advice-recurse-submodules (2023-01-18) 1 commit
401
+ (merged to 'next' on 2023-01-19 at 13747fc72d)
402
+ + branch: improve advice when --recurse-submodules fails
403
+
404
+ Improve advice message given when "git branch --resurse-submodules"
405
+ fails.
406
+
407
+ Will merge to 'master'.
408
+ source: <pull.1464.git.1673890908453.gitgitgadget@gmail.com>
409
+
410
+
411
+* ab/sequencer-unleak (2023-01-18) 8 commits
412
+ - commit.c: free() revs.commit in get_fork_point()
413
+ - builtin/rebase.c: free() "options.strategy_opts"
414
+ - sequencer.c: always free() the "msgbuf" in do_pick_commit()
415
+ - builtin/rebase.c: fix "options.onto_name" leak
416
+ - builtin/revert.c: move free-ing of "revs" to replay_opts_release()
417
+ - rebase & sequencer API: fix get_replay_opts() leak in "rebase"
418
+ - sequencer.c: split up sequencer_remove_state()
419
+ - rebase: use "cleanup" pattern in do_interactive_rebase()
420
+
421
+ Plug leaks in sequencer subsystem and its users.
422
+
423
+ Expecting a hopefully minor and final reroll.
424
+ cf. <xmqqedry17r4.fsf@gitster.g>
425
+ source: <cover-v3-0.8-00000000000-20230118T160600Z-avarab@gmail.com>
426
+
427
+
428
+* jk/hash-object-literally-fd-leak (2023-01-19) 1 commit
429
+ (merged to 'next' on 2023-01-19 at fff9b60a36)
430
+ + hash-object: fix descriptor leak with --literally
431
515
- Needs review on the updated round.
516
- source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
432
+ Leakfix.
433
434
+ Will merge to 'master'.
435
+ source: <Y8ijpJqtkDTi792i@coredump.intra.peff.net>
436
519
-* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit
520
- - e-mail workflow: Message-ID is spelled with ID in both capital letters
437
522
- Consistently spell "Message-ID" as such, not "Message-Id".
438
+* jc/doc-branch-update-checked-out-branch (2023-01-18) 1 commit
439
+ (merged to 'next' on 2023-01-19 at 970900a232)
440
+ + branch: document `-f` and linked worktree behaviour
441
524
- Needs review.
525
- source: <xmqqsfhgnmqg.fsf@gitster.g>
442
+ Document that "branch -f <branch>" disables only the safety to
443
+ avoid recreating an existing branch.
444
445
+ Will merge to 'master'.
446
+ source: <xmqqa62f2dj1.fsf_-_@gitster.g>
447
528
-* cb/grep-fallback-failing-jit (2022-12-17) 1 commit
529
- - grep: fall back to interpreter mode if JIT fails
448
531
- In an environment where dynamically generated code is prohibited to
532
- run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
533
- back to interpreted execution in such a case.
449
+* jc/doc-checkout-b (2023-01-19) 1 commit
450
+ (merged to 'next' on 2023-01-23 at 95340e1941)
451
+ + checkout: document -b/-B to highlight the differences from "git branch"
452
535
- Expecting a reroll.
536
- cf. <f680b274-fa85-6624-096a-7753a2671c15@grsecurity.net>
537
- source: <20221216121557.30714-1-minipli@grsecurity.net>
453
+ Clarify how "checkout -b/-B" and "git branch [-f]" are similar but
454
+ different in the documentation.
455
456
+ Will merge to 'master'.
457
+ source: <xmqqtu0m1m9i.fsf@gitster.g>
458
540
-* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
541
- - test-lib: allow storing counts with test harnesses
459
543
- Allow summary results from tests to be written to t/test-results
544
- directory even when a test harness like 'prove' is in use.
460
+* cw/fetch-remote-group-with-duplication (2023-01-19) 1 commit
461
+ (merged to 'next' on 2023-01-20 at 7f00e43209)
462
+ + fetch: fix duplicate remote parallel fetch bug
463
546
- Needs review.
547
- source: <20221224225200.1027806-1-adam@dinwoodie.org>
464
+ "git fetch <group>", when "<group>" of remotes lists the same
465
+ remote twice, unnecessarily failed when parallel fetching was
466
+ enabled, which has been corrected.
467
468
+ Will merge to 'master'.
469
+ source: <20230119220538.1522464-1-calvinwan@google.com>
470
550
-* so/diff-merges-more (2022-12-18) 5 commits
551
- - diff-merges: improve --diff-merges documentation
552
- - diff-merges: issue warning on lone '-m' option
553
- - diff-merges: support list of values for --diff-merges
554
- - diff-merges: implement log.diffMerges-m-imply-p config
555
- - diff-merges: implement [no-]hide option and log.diffMergesHide config
471
557
- Assorted updates to "--diff-merges=X" option.
472
+* po/pretty-format-columns-doc (2023-01-19) 5 commits
473
+ (merged to 'next' on 2023-01-23 at d41cb5f527)
474
+ + doc: pretty-formats note wide char limitations, and add tests
475
+ + doc: pretty-formats describe use of ellipsis in truncation
476
+ + doc: pretty-formats document negative column alignments
477
+ + doc: pretty-formats: delineate `%<|(` parameter values
478
+ + doc: pretty-formats: separate parameters from placeholders
479
559
- May want to discard. Breaking compatibility does not seem worth it.
560
- source: <20221217132955.108542-1-sorganov@gmail.com>
480
+ Clarify column-padding operators in the pretty format string.
481
562
---------------------------------------------------
563
-[Cooking]
482
+ Will merge to 'master'.
483
+ source: <20230119181827.1319-1-philipoakley@iee.email>
484
565
-* rs/ls-tree-path-expansion-fix (2023-01-14) 2 commits
566
- (merged to 'next' on 2023-01-16 at 6359f28ba7)
567
- + ls-tree: remove dead store and strbuf for quote_c_style()
568
- + ls-tree: fix expansion of repeated %(path)
485
570
- "git ls-tree --format='%(path) %(path)' $tree $path" showed the
571
- path three times, which has been corrected.
486
+* jk/hash-object-fsck (2023-01-19) 7 commits
487
+ (merged to 'next' on 2023-01-23 at 985e87fc34)
488
+ + fsck: do not assume NUL-termination of buffers
489
+ + hash-object: use fsck for object checks
490
+ + fsck: provide a function to fsck buffer without object struct
491
+ + t: use hash-object --literally when created malformed objects
492
+ + t7030: stop using invalid tag name
493
+ + t1006: stop using 0-padded timestamps
494
+ + t1007: modernize malformed object tests
495
+
496
+ "git hash-object" now checks that the resulting object is well
497
+ formed with the same code as "git fsck".
498
499
Will merge to 'master'.
574
- source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
500
+ source: <Y8hX+pIZUKXsyYj5@coredump.intra.peff.net>
501
+ source: <Y8ifa7hyqxSbL92U@coredump.intra.peff.net>
502
503
577
-* jc/format-patch-v-unleak (2023-01-16) 1 commit
578
- (merged to 'next' on 2023-01-16 at 2155d512bc)
579
- + format-patch: unleak "-v <num>"
504
+* tb/t0003-invoke-dd-more-portably (2023-01-22) 1 commit
505
+ (merged to 'next' on 2023-01-23 at 917aa24a27)
506
+ + t0003: call dd with portable blocksize
507
581
- Plug a small leak.
508
+ Test portability fix.
509
510
Will merge to 'master'.
584
- source: <xmqqv8l8gr6s.fsf@gitster.g>
511
+ source: <20230122062839.14542-1-tboegi@web.de>
512
513
587
-* ds/omit-trailing-hash-in-index (2023-01-17) 1 commit
588
- (merged to 'next' on 2023-01-17 at 8dde3cf2db)
589
- + t1600: fix racy index.skipHash test
590
- (this branch is used by ab/cache-api-cleanup-users.)
514
+* jc/attr-doc-fix (2023-01-22) 1 commit
515
+ (merged to 'next' on 2023-01-24 at a25d37cb0f)
516
+ + attr: fix instructions on how to check attrs
517
592
- Quickfix for a topic already in 'master'.
518
+ Comment fix.
519
520
Will merge to 'master'.
595
- source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
521
+ source: <pull.1441.v2.git.git.1674447742078.gitgitgadget@gmail.com>
522
523
598
-* ab/cache-api-cleanup (2023-01-16) 5 commits
599
- (merged to 'next' on 2023-01-16 at a0f388b149)
600
- + cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
601
- + read-cache.c: refactor set_new_index_sparsity() for subsequent commit
602
- + sparse-index API: BUG() out on NULL ensure_full_index()
603
- + sparse-index.c: expand_to_path() can assume non-NULL "istate"
604
- + builtin/difftool.c: { 0 }-initialize rather than using memset()
605
- (this branch is used by ab/cache-api-cleanup-users.)
524
+* rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits
525
+ - switch: reject if the branch is already checked out elsewhere (test)
526
+ - rebase: refuse to switch to a branch already checked out elsewhere (test)
527
+ - branch: fix die_if_checked_out() when ignore_current_worktree
528
607
- Code clean-up to tighten the use of in-core index in the API.
529
+ A few subcommands have been taught to stop users from working on a
530
+ branch that is being used in another worktree linked to the same
531
+ repository.
532
609
- Will merge to 'master'.
610
- source: <cover-v2-0.6-00000000000-20230112T124842Z-avarab@gmail.com>
533
+ Expecting a (hopefully final) reroll.
534
+ cf. <d61a2393-64c8-da49-fe13-00bc4a52d5e3@gmail.com>
535
+ source: <f7f45f54-9261-45ea-3399-8ba8dee6832b@gmail.com>
536
537
613
-* ab/test-env-helper (2023-01-14) 1 commit
614
- (merged to 'next' on 2023-01-16 at 82c17f02e5)
615
- + env-helper: move this built-in to "test-tool env-helper"
538
+* rj/bisect-already-used-branch (2023-01-22) 1 commit
539
+ - bisect: fix "reset" when branch is checked out elsewhere
540
617
- Remove "git env--helper" and demote it to a test-tool subcommand.
541
+ Allow "git bisect reset [name]" to check out the named branch (or
542
+ the original one) even when the branch is already checked out in a
543
+ different worktree linked to the same repository.
544
619
- Will merge to 'master'.
620
- source: <patch-1.1-e662c570f1d-20230112T155226Z-avarab@gmail.com>
545
+ Leaning negative. Why is it a good thing?
546
+ cf. <xmqqo7qqovp1.fsf@gitster.g>
547
+ source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
548
549
550
* en/ls-files-doc-update (2023-01-13) 4 commits
@@ -628,30 +555,10 @@ Release tarballs are available at:
555
556
Doc update to ls-files.
557
631
- Will merge to 'next'?
558
+ Will merge to 'next'.
559
source: <pull.1463.git.1673584914.gitgitgadget@gmail.com>
560
561
635
-* en/t6426-todo-cleanup (2023-01-14) 1 commit
636
- (merged to 'next' on 2023-01-16 at 7d13842eeb)
637
- + t6426: fix TODO about making test more comprehensive
638
-
639
- Test clean-up.
640
-
641
- Will merge to 'master'.
642
- source: <pull.1462.v2.git.1673722187025.gitgitgadget@gmail.com>
643
-
644
-
645
-* zh/scalar-progress (2023-01-16) 1 commit
646
- (merged to 'next' on 2023-01-17 at d4c25cc71f)
647
- + scalar: show progress if stderr refers to a terminal
648
-
649
- "scalar" learned to give progress bar.
650
-
651
- Will merge to 'master'.
652
- source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
653
-
654
-
562
* ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits
563
- send-email: expose header information to git-send-email's sendemail-validate hook
564
- send-email: refactor header generation functions
@@ -664,7 +571,8 @@ Release tarballs are available at:
571
source: <20230120012459.920932-1-michael.strawbridge@amd.com>
572
573
667
-* ds/bundle-uri-5 (2023-01-07) 8 commits
574
+* ds/bundle-uri-5 (2023-01-23) 10 commits
575
+ - bundle-uri: test missing bundles with heuristic
576
- bundle-uri: store fetch.bundleCreationToken
577
- fetch: fetch from an external bundle URI
578
- bundle-uri: drop bundle.flag from design doc
@@ -673,13 +581,16 @@ Release tarballs are available at:
581
- bundle-uri: parse bundle.<id>.creationToken values
582
- bundle-uri: parse bundle.heuristic=creationToken
583
- t5558: add tests for creationToken heuristic
584
+ - bundle: optionally skip reachability walk
585
586
The bundle-URI subsystem adds support for creation-token heuristics
587
to help incremental fetches.
588
589
Expecting a reroll.
681
- cf. <4e2ac966-0f45-8018-ff8f-3831ea0c3c2e@github.com>
682
- source: <pull.1454.git.1673037405.gitgitgadget@gmail.com>
590
+ cf. <771a2993-85bd-0831-0977-24204f84e206@github.com>
591
+ cf. <01f97aff-58a1-ef2c-e668-d37ea513c64e@github.com>
592
+ cf. <ecc6b167-f5c4-48ce-3973-461d1659ed40@github.com>
593
+ source: <pull.1454.v2.git.1674487310.gitgitgadget@gmail.com>
594
595
596
* tc/cat-file-z-use-cquote (2023-01-16) 1 commit
@@ -706,19 +617,6 @@ Release tarballs are available at:
617
source: <20230108155217.2817-1-carenas@gmail.com>
618
619
709
-* rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
710
- (merged to 'next' on 2023-01-16 at 9b80d4253f)
711
- + use enhanced basic regular expressions on macOS
712
-
713
- Newer regex library macOS stopped enabling GNU-like enhanced BRE,
714
- where '\(A\|B\)' works as alternation, unless explicitly asked with
715
- the REG_ENHANCED flag. "git grep" now can be compiled to do so, to
716
- retain the old behaviour.
717
-
718
- Will merge to 'master'.
719
- source: <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
720
-
721
-
620
* cw/submodule-status-in-parallel (2023-01-17) 6 commits
621
- submodule: call parallel code from serial status
622
- diff-lib: parallelize run_diff_files for submodules
@@ -730,22 +628,12 @@ Release tarballs are available at:
628
"git submodule status" learned to run the comparison in submodule
629
repositories in parallel.
630
733
- Needs review.
631
+ Expecting a reroll.
632
+ cf. <CAFySSZBiW7=ZTmXRaLzCoKUi0Jd=fzvW5PJ6=Ka0jKHoP2ddSw@mail.gmail.com>
633
+ cf. <kl6lo7qlvg4h.fsf@chooglen-macbookpro.roam.corp.google.com>
634
source: <20230104215415.1083526-1-calvinwan@google.com>
635
636
737
-* kn/attr-from-tree (2023-01-14) 2 commits
738
- (merged to 'next' on 2023-01-16 at 426f357683)
739
- + attr: add flag `--source` to work with tree-ish
740
- + t0003: move setup for `--all` into new block
741
-
742
- "git check-attr" learned to take an optional tree-ish to read the
743
- .gitattributes file from.
744
-
745
- Will merge to 'master'.
746
- source: <cover.1673684790.git.karthik.188@gmail.com>
747
-
748
-
637
* ab/various-leak-fixes (2023-01-18) 19 commits
638
- push: free_refs() the "local_refs" in set_refspecs()
639
- receive-pack: free() the "ref_name" in "struct command"
@@ -786,34 +674,6 @@ Release tarballs are available at:
674
source: <34a58449-4f2e-66ef-ea01-119186aebd23@gmail.com>
675
676
789
-* ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
790
- - tests: don't lose misc "git" exit codes
791
- - tests: don't lose "git" exit codes in "! ( git ... | grep )"
792
- - tests: don't lose exit status with "test <op> $(git ...)"
793
- - tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
794
- - t/lib-patch-mode.sh: fix ignored exit codes
795
- - auto-crlf tests: don't lose exit code in loops and outside tests
796
-
797
- Test clean-up.
798
-
799
- Expecting a hopefully minor and final reroll.
800
- cf. <1182283a-4a78-3c99-e716-a8c3e58a5823@web.de>
801
- cf. <xmqqsfhb0vum.fsf@gitster.g>
802
- source: <cover-v4-0.6-00000000000-20221219T101240Z-avarab@gmail.com>
803
-
804
-
805
-* sk/win32-close-handle-upon-pthread-join (2023-01-04) 2 commits
806
- (merged to 'next' on 2023-01-16 at faa279fd5b)
807
- + win32: close handles of threads that have been joined
808
- + win32: prepare pthread.c for change by formatting
809
-
810
- Pthread emulation on Win32 leaked thread handle when a thread is
811
- joined.
812
-
813
- Will merge to 'master'.
814
- source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
815
-
816
-
677
* km/send-email-with-v-reroll-count (2022-11-27) 1 commit
678
(merged to 'next' on 2023-01-19 at 9b3543471c)
679
+ send-email: relay '-v N' to format-patch
@@ -826,50 +686,26 @@ Release tarballs are available at:
686
source: <87edtp5uws.fsf@kyleam.com>
687
688
829
-* ja/worktree-orphan (2023-01-13) 4 commits
830
- - worktree add: add hint to direct users towards --orphan
831
- - worktree add: add --orphan flag
832
- - worktree add: refactor opt exclusion tests
833
- - worktree add: include -B in usage docs
834
-
835
- 'git worktree add' learned how to create a worktree based on an
836
- orphaned branch with `--orphan`.
837
-
838
- Expecting a reroll.
839
- cf. <11be1b0e-ee38-119f-1d80-cb818946116b@dunelm.org.uk>
840
- source: <20230109173227.29264-1-jacobabel@nullpo.dev>
841
-
842
-
843
-* cc/filtered-repack (2022-12-25) 3 commits
844
- - gc: add gc.repackFilter config option
845
- - repack: add --filter=<filter-spec> option
846
- - pack-objects: allow --filter without --stdout
847
-
848
- "git repack" learns to discard objects that ought to be retrievable
849
- again from the promisor remote.
850
-
851
- May want to discard. Its jaggy edges may be a bit too sharp.
852
- cf. <Y7WTv19aqiFCU8au@ncase>
853
- source: <20221221040446.2860985-1-christian.couder@gmail.com>
854
-
855
-
689
* mc/credential-helper-auth-headers (2023-01-20) 12 commits
857
- - credential: add WWW-Authenticate header to cred requests
858
- - http: read HTTP WWW-Authenticate response headers
859
- - http: replace unsafe size_t multiplication with st_mult
860
- - test-http-server: add sending of arbitrary headers
861
- - test-http-server: add simple authentication
862
- - test-http-server: pass Git requests to http-backend
863
- - test-http-server: add HTTP request parsing
864
- - test-http-server: add HTTP error response function
865
- - test-http-server: add stub HTTP server test helper
866
- - daemon: rename some esoteric/laboured terminology
867
- - daemon: libify child process handling functions
868
- - daemon: libify socket setup and option functions
690
+ (merged to 'next' on 2023-01-25 at cb95006bb2)
691
+ + credential: add WWW-Authenticate header to cred requests
692
+ + http: read HTTP WWW-Authenticate response headers
693
+ + http: replace unsafe size_t multiplication with st_mult
694
+ + test-http-server: add sending of arbitrary headers
695
+ + test-http-server: add simple authentication
696
+ + test-http-server: pass Git requests to http-backend
697
+ + test-http-server: add HTTP request parsing
698
+ + test-http-server: add HTTP error response function
699
+ + test-http-server: add stub HTTP server test helper
700
+ + daemon: rename some esoteric/laboured terminology
701
+ + daemon: libify child process handling functions
702
+ + daemon: libify socket setup and option functions
703
704
Extending credential helper protocol.
705
872
- Needs review.
706
+ Will kick out of 'next'. The test-only server is an eyesore.
707
+ cf. <e57c1ca3-c21c-db41-a386-e5887f46055c@github.com>
708
+ cf. <Y9JkMLueCwjkLHOr@coredump.intra.peff.net>
709
source: <pull.1352.v7.git.1674252530.gitgitgadget@gmail.com>
710
711
--------------------------------------------------
@@ -890,4 +726,50 @@ Release tarballs are available at:
726
. pretty-formats: add hard truncation, without ellipsis, options
727
728
Add a new pretty format which truncates without ellipsis.
729
+
730
+ Superseded by the 'po/pretty-format-columns-doc' topic.
731
source: <20221112143616.1429-1-philipoakley@iee.email>
732
+
733
+
734
+* en/rebase-update-refs-needs-merge-backend (2023-01-22) 9 commits
735
+ (merged to 'next' on 2023-01-23 at 1b65346647)
736
+ + rebase: provide better error message for apply options vs. merge config
737
+ + rebase: put rebase_options initialization in single place
738
+ + rebase: fix formatting of rebase --reapply-cherry-picks option in docs
739
+ + rebase: clarify the OPT_CMDMODE incompatibilities
740
+ + rebase: add coverage of other incompatible options
741
+ + rebase: fix docs about incompatibilities with --root
742
+ + rebase: remove --allow-empty-message from incompatible opts
743
+ + rebase: flag --apply and --merge as incompatible
744
+ + rebase: mark --update-refs as requiring the merge backend
745
+
746
+ The "--update-refs" feature of "git rebase" requires the use of the
747
+ merge backend, while "--whitespace=fix" feature does not work with
748
+ the said backend. Notice the combination and error out, instead of
749
+ silently ignoring one of the features requested.
750
+
751
+ Reverted out of 'next' to be replaced with en/rebase-incompatible-opts
752
+ source: <pull.1466.v4.git.1674367961.gitgitgadget@gmail.com>
753
+
754
+
755
+* rs/tree-parse-mode-overflow-check (2023-01-21) 1 commit
756
+ . tree-walk: disallow overflowing modes
757
+
758
+ Reject tree objects with entries whose mode bits are overly wide.
759
+
760
+ Retracted.
761
+ cf. <b4b48877-5b80-e96f-d09f-2fe275f42950@web.de>
762
+ source: <d673fde7-7eb2-6306-86b6-1c1a4c988ee8@web.de>
763
+
764
+
765
+* cc/filtered-repack (2022-12-25) 3 commits
766
+ . gc: add gc.repackFilter config option
767
+ . repack: add --filter=<filter-spec> option
768
+ . pack-objects: allow --filter without --stdout
769
+
770
+ "git repack" learns to discard objects that ought to be retrievable
771
+ again from the promisor remote.
772
+
773
+ May want to discard. Its jaggy edges may be a bit too sharp.
774
+ cf. <Y7WTv19aqiFCU8au@ncase>
775
+ source: <20221221040446.2860985-1-christian.couder@gmail.com>