@matheusbsbs / matheus-bagliano / commits / 4ebdbf9f3e

What's cooking (2023/01 #06)

Junio C Hamano committed Jan 22, 2023 at 20:45 UTC 4ebdbf9f3e5c676e5019d3bfef49f6377a0ac326
1 file changed +443 -341
whats-cooking.txt
+443 -341
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jan 2023, #05; Tue, 17)
3 -X-master-at: a7caae2729742fc80147bca1c02ae848cb55921a
4 -X-next-at: 3abcab475e35598790da85d8a607d719986a9436
2 +Subject: What's cooking in git.git (Jan 2023, #06; Sun, 22)
3 +X-master-at: 56c8fb1e95377900ec9d53c07886022af0a5d3c2
4 +X-next-at: fc5497dd1b1018e63e916d3ef950ac3f70ea090d
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Jan 2023, #05; Tue, 17)
7 +What's cooking in git.git (Jan 2023, #06; Sun, 22)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -14,10 +14,6 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
14 considered "accepted" at all. A topic without enough support may be
15 discarded after a long period of no activity.
16
17 -A maintenance release Git 2.39.1 and friends to address two security
18 -issues are out, and today's 'master', 'next', and 'seen' all include
19 -the fix.
20 -
17 Copies of the source code to Git live in many repositories, and the
18 following is a list of the ones I push into or their mirrors. Some
19 repositories have only a subset of branches.
@@ -49,142 +45,391 @@ Release tarballs are available at:
45 --------------------------------------------------
46 [Graduated to 'master']
47
52 -* ds/omit-trailing-hash-in-index (2023-01-07) 4 commits
53 - (merged to 'next' on 2023-01-09 at e17ef56485)
54 - + features: feature.manyFiles implies fast index writes
55 - + test-lib-functions: add helper for trailing hash
56 - + read-cache: add index.skipHash config option
57 - + hashfile: allow skipping the hash function
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
59 - Introduce an optional configuration to allow the trailing hash that
60 - protects the index file from bit flipping.
61 - source: <pull.1439.v5.git.1673022717.gitgitgadget@gmail.com>
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
63 -* ar/dup-words-fixes (2023-01-08) 1 commit
64 - (merged to 'next' on 2023-01-09 at 2a5d4537a2)
65 - + *: fix typos which duplicate a word
92 + Doc update.
93 + source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
94
67 - Typofixes.
68 - source: <20230107135655.149892-1-rybak.a.v@gmail.com>
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
71 -* ds/bundle-uri-4 (2023-01-06) 1 commit
72 - (merged to 'next' on 2023-01-08 at d5b03bdd48)
73 - + test-bundle-uri: drop unused variables
74 - (this branch is used by ds/bundle-uri-5.)
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()
123
124 Code clean-up.
77 - source: <Y7fgV5eFx78BHdQ4@coredump.intra.peff.net>
125 + source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
126
127
80 -* es/t1509-root-fixes (2022-12-09) 3 commits
81 - (merged to 'next' on 2023-01-08 at c922e34bab)
82 - + t1509: facilitate repeated script invocations
83 - + t1509: make "setup" test more robust
84 - + t1509: fix failing "root work tree" test due to owner-check
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
133
86 - Test fixes.
87 - source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
134 + Test updates.
135 + source: <20221128130323.8914-1-worldhello.net@gmail.com>
136
137
90 -* jk/ext-diff-with-relative (2023-01-06) 3 commits
91 - (merged to 'next' on 2023-01-08 at 5233a7d3ee)
92 - + diff: drop "name" parameter from prepare_temp_file()
93 - + diff: clean up external-diff argv setup
94 - + diff: use filespec path to set up tempfiles for ext-diff
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
145
96 - "git diff --relative" did not mix well with "git diff --ext-diff",
97 - which has been corrected.
98 - source: <Y7f/YiVu1TgbucDI@coredump.intra.peff.net>
146 + Document ORIG_HEAD a bit more.
147 + source: <pull.1456.v2.git.1673356521.gitgitgadget@gmail.com>
148
149
101 -* jk/strncmp-to-api-funcs (2023-01-08) 2 commits
102 - (merged to 'next' on 2023-01-09 at 47395b7c6f)
103 - + convert trivial uses of strncmp() to skip_prefix()
104 - + convert trivial uses of strncmp() to starts_with()
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
153 +
154 + Loosen date parsing heuristics.
155 + source: <20230111001003.10916-1-congdanhqx@gmail.com>
156 +
157 +
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
161
162 Code clean-up.
107 - source: <Y7lyga5g2leSmWQd@coredump.intra.peff.net>
163 + source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
164
165
110 -* pw/ci-print-failure-name-fix (2023-01-04) 1 commit
111 - (merged to 'next' on 2023-01-08 at 8bb55c12c7)
112 - + ci(github): restore "print test failures" step name
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
173
114 - (cosmetic) CI regression fix.
115 - source: <pull.1453.git.1672741640587.gitgitgadget@gmail.com>
174 + Code cleaning.
175 + source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
176 + source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
177
178
118 -* tb/ci-concurrency (2022-11-08) 1 commit
119 - (merged to 'next' on 2023-01-08 at ab7cdc20b8)
120 - + ci: avoid unnecessary builds
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
182
122 - Avoid unnecessary builds in CI, with settings configured in
123 - ci-config.
124 - source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
183 + Micro optimization.
184 + source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
185
186
127 -* tr/am--no-verify (2023-01-05) 1 commit
128 - (merged to 'next' on 2023-01-08 at 4585013067)
129 - + am: allow passing --no-verify flag
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
195
131 - Conditionally skip the pre-applypatch and applypatch-msg hooks when
132 - applying patches with 'git am'.
133 - source: <20221130172833.2662751-1-thierry.reding@gmail.com>
196 + Code clean-up.
197 + source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
198
199
136 -* ws/single-file-cone (2023-01-05) 1 commit
137 - (merged to 'next' on 2023-01-09 at b6d4d7b905)
138 - + dir: check for single file cone patterns
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
203
140 - The logic to see if we are using the "cone" mode by checking the
141 - sparsity patterns has been tightened to avoid mistaking a pattern
142 - that names a single file as specifying a cone.
143 - source: <pull.1446.v2.git.1672734059938.gitgitgadget@gmail.com>
204 + Doc fix.
205 + source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
206 +
207 +
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
211 +
212 + Doc update.
213 + source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
214
215 --------------------------------------------------
216 [New Topics]
217
148 -* rs/ls-tree-path-expansion-fix (2023-01-14) 2 commits
149 - (merged to 'next' on 2023-01-16 at 6359f28ba7)
150 - + ls-tree: remove dead store and strbuf for quote_c_style()
151 - + ls-tree: fix expansion of repeated %(path)
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.)
224
153 - "git ls-tree --format='%(path) %(path)' $tree $path" showed the
154 - path three times, which has been corrected.
225 + Updates the users of the cache API.
226
227 Will merge to 'master'.
157 - source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
228 + cf. <db312853-81a1-542b-db96-d816c463516c@github.com>
229 + source: <patch-1.1-b4998652822-20230117T135234Z-avarab@gmail.com>
230
231
160 -* jc/format-patch-v-unleak (2023-01-16) 1 commit
161 - (merged to 'next' on 2023-01-16 at 2155d512bc)
162 - + format-patch: unleak "-v <num>"
232 +* cb/checkout-same-branch-twice (2023-01-20) 1 commit
233 + - checkout/switch: disallow checking out same branch in multiple worktrees
234
164 - Plug a small leak.
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
246 +
247 + Docfix.
248
249 Will merge to 'master'.
167 - source: <xmqqv8l8gr6s.fsf@gitster.g>
250 + source: <20230118082749.1252459-1-martin.agren@gmail.com>
251
252
170 -* jk/curl-avoid-deprecated-api (2023-01-17) 3 commits
171 - - http: support CURLOPT_PROTOCOLS_STR
172 - - http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
173 - - http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
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
256 +
257 + Improve advice message given when "git branch --resurse-submodules"
258 + fails.
259 +
260 + Will merge to 'master'.
261 + source: <pull.1464.git.1673890908453.gitgitgadget@gmail.com>
262
175 - Deal with a few deprecation warning from cURL library.
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>
278 +
279 +
280 +* en/rebase-update-refs-needs-merge-backend (2023-01-22) 9 commits
281 + - rebase: provide better error message for apply options vs. merge config
282 + - rebase: put rebase_options initialization in single place
283 + - rebase: fix formatting of rebase --reapply-cherry-picks option in docs
284 + - rebase: clarify the OPT_CMDMODE incompatibilities
285 + - rebase: add coverage of other incompatible options
286 + - rebase: fix docs about incompatibilities with --root
287 + - rebase: remove --allow-empty-message from incompatible opts
288 + - rebase: flag --apply and --merge as incompatible
289 + - rebase: mark --update-refs as requiring the merge backend
290 +
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'.
178 - source: <Y8YP+R/hyNr6sEFA@coredump.intra.peff.net>
328 + source: <xmqqtu0m1m9i.fsf@gitster.g>
329
330
181 -* ds/omit-trailing-hash-in-index (2023-01-17) 1 commit
182 - - t1600: fix racy index.skipHash test
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
184 - Quickfix for a topic already in 'master'.
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
186 - Will merge to 'next' and then to 'master'.
187 - source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
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.
395 +
396 + Will merge to 'next'.
397 + source: <20230122165628.1601062-1-rybak.a.v@gmail.com>
398 +
399 +
400 +* jc/attr-doc-fix (2023-01-22) 1 commit
401 + - attr: fix instructions on how to check attrs
402 +
403 + Comment fix.
404 +
405 + Will merge to 'next'.
406 + source: <pull.1441.git.git.1674356774172.gitgitgadget@gmail.com>
407 +
408 +
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
413 +
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.
417 +
418 + Expecting a (hopefully final) reroll.
419 + cf. <d61a2393-64c8-da49-fe13-00bc4a52d5e3@gmail.com>
420 + source: <f7f45f54-9261-45ea-3399-8ba8dee6832b@gmail.com>
421 +
422 +
423 +* rj/bisect-already-used-branch (2023-01-22) 1 commit
424 + - bisect: fix "reset" when branch is checked out elsewhere
425 +
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.
429 +
430 + Leaning negative. Why is it a good thing?
431 + cf. <xmqqo7qqovp1.fsf@gitster.g>
432 + source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
433
434 --------------------------------------------------
435 [Stalled]
@@ -204,16 +449,6 @@ Release tarballs are available at:
449 source: <cover.1667980450.git.dyroneteng@gmail.com>
450
451
207 -* po/pretty-hard-trunc (2022-11-13) 1 commit
208 - - pretty-formats: add hard truncation, without ellipsis, options
209 -
210 - Add a new pretty format which truncates without ellipsis.
211 -
212 - Expecting a reroll.
213 - cf. <093e1dca-b9d4-f1f2-0845-ad6711622cf5@iee.email>
214 - source: <20221112143616.1429-1-philipoakley@iee.email>
215 -
216 -
452 * mc/switch-advice (2022-11-09) 1 commit
453 - po: use `switch` over `checkout` in error message
454
@@ -263,7 +498,7 @@ Release tarballs are available at:
498
499 Assorted config API updates.
500
266 - Needs review.
501 + Expecting a reroll.
502 source: <cover-v3-0.9-00000000000-20221125T093158Z-avarab@gmail.com>
503
504
@@ -298,7 +533,7 @@ Release tarballs are available at:
533 back to interpreted execution in such a case.
534
535 Expecting a reroll.
301 - cf. <62a06c5b-9646-17f8-b4d5-39823d3cc25a@grsecurity.net>
536 + cf. <f680b274-fa85-6624-096a-7753a2671c15@grsecurity.net>
537 source: <20221216121557.30714-1-minipli@grsecurity.net>
538
539
@@ -327,6 +562,39 @@ Release tarballs are available at:
562 --------------------------------------------------
563 [Cooking]
564
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)
569 +
570 + "git ls-tree --format='%(path) %(path)' $tree $path" showed the
571 + path three times, which has been corrected.
572 +
573 + Will merge to 'master'.
574 + source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
575 +
576 +
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>"
580 +
581 + Plug a small leak.
582 +
583 + Will merge to 'master'.
584 + source: <xmqqv8l8gr6s.fsf@gitster.g>
585 +
586 +
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.)
591 +
592 + Quickfix for a topic already in 'master'.
593 +
594 + Will merge to 'master'.
595 + source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
596 +
597 +
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()
@@ -334,6 +602,7 @@ Release tarballs are available at:
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.)
606
607 Code clean-up to tighten the use of in-core index in the API.
608
@@ -351,29 +620,6 @@ Release tarballs are available at:
620 source: <patch-1.1-e662c570f1d-20230112T155226Z-avarab@gmail.com>
621
622
354 -* ar/bisect-doc-update (2023-01-13) 2 commits
355 - (merged to 'next' on 2023-01-14 at df5185519c)
356 - + git-bisect-lk2009: update nist report link
357 - + git-bisect-lk2009: update java code conventions link
358 -
359 - Doc update.
360 -
361 - Will merge to 'master'.
362 - source: <20230110093251.193552-1-rybak.a.v@gmail.com>
363 -
364 -
365 -* ar/test-cleanup (2023-01-13) 3 commits
366 - (merged to 'next' on 2023-01-14 at 16d372b65d)
367 - + t7527: use test_when_finished in 'case insensitive+preserving'
368 - + t6422: drop commented out code
369 - + t6003: uncomment test '--max-age=c3, --topo-order'
370 -
371 - Test clean-up.
372 -
373 - Will merge to 'master'.
374 - source: <20230111233242.16870-1-rybak.a.v@gmail.com>
375 -
376 -
623 * en/ls-files-doc-update (2023-01-13) 4 commits
624 - ls-files: guide folks to --exclude-standard over other --exclude* options
625 - ls-files: clarify descriptions of status tags for -t
@@ -382,7 +628,7 @@ Release tarballs are available at:
628
629 Doc update to ls-files.
630
385 - Needs review.
631 + Will merge to 'next'?
632 source: <pull.1463.git.1673584914.gitgitgadget@gmail.com>
633
634
@@ -396,124 +642,26 @@ Release tarballs are available at:
642 source: <pull.1462.v2.git.1673722187025.gitgitgadget@gmail.com>
643
644
399 -* jc/doc-diff-patch.txt (2023-01-13) 1 commit
400 - (merged to 'next' on 2023-01-14 at d25ec1f631)
401 - + docs: link generating patch sections
402 -
403 - Doc update.
404 -
405 - Will merge to 'master'.
406 - source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
407 -
408 -
409 -* jk/interop-error (2023-01-13) 1 commit
410 - (merged to 'next' on 2023-01-14 at ddca7887a5)
411 - + t/interop: report which vanilla git command failed
412 -
413 - Test helper improvement.
414 -
415 - Will merge to 'master'.
416 - source: <Y8A3yGeJl0TCDNqe@coredump.intra.peff.net>
417 -
418 -
419 -* pw/rebase-exec-cleanup (2023-01-13) 1 commit
420 - (merged to 'next' on 2023-01-14 at 553d0daa62)
421 - + rebase: cleanup "--exec" option handling
422 -
423 - Code clean-up.
424 -
425 - Will merge to 'master'.
426 - source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
427 -
428 -
429 -* sk/merge-filtering-strategies-micro-optim (2023-01-13) 1 commit
430 - (merged to 'next' on 2023-01-14 at f171559fae)
431 - + merge: break out of all_strategy loop when strategy is found
432 -
433 - Micro optimization.
434 -
435 - Will merge to 'master'.
436 - source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
437 -
438 -
439 -* yo/doc-use-more-switch-c (2023-01-13) 1 commit
440 - (merged to 'next' on 2023-01-14 at 7169d5dabc)
441 - + doc: add "git switch -c" as another option on detached HEAD
442 -
443 - Doc update.
444 -
445 - Will merge to 'master'.
446 - source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
447 -
448 -
645 * zh/scalar-progress (2023-01-16) 1 commit
450 - - scalar: show progress if stderr refers to a terminal
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
454 - Will merge to 'next'.
455 - source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
456 -
457 -
458 -* ab/bisect-cleanup (2023-01-13) 6 commits
459 - (merged to 'next' on 2023-01-14 at 945b631a1e)
460 - + bisect: no longer try to clean up left-over `.git/head-name` files
461 - + bisect: remove Cogito-related code
462 - + bisect run: fix the error message
463 - + bisect: verify that a bogus option won't try to start a bisection
464 - + bisect--helper: make the order consistently `argc, argv`
465 - + bisect--helper: simplify exit code computation
466 -
467 - Code clean-up.
468 -
651 Will merge to 'master'.
470 - source: <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
652 + source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
653
654
473 -* ms/send-email-feed-header-to-validate-hook (2023-01-17) 2 commits
655 +* ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits
656 - send-email: expose header information to git-send-email's sendemail-validate hook
657 - send-email: refactor header generation functions
658
659 "git send-email" learned to give the e-mail headers to the validate
660 hook by passing an extra argument from the command line.
661
480 - Under review.
481 - source: <20230117142706.230404-1-michael.strawbridge@amd.com>
482 -
483 -
484 -* tl/ls-tree-code-clean-up (2023-01-13) 6 commits
485 - (merged to 'next' on 2023-01-14 at f7238037fd)
486 - + t3104: remove shift code in 'test_ls_tree_format'
487 - + ls-tree: cleanup the redundant SPACE
488 - + ls-tree: make "line_termination" less generic
489 - + ls-tree: fold "show_tree_data" into "cb" struct
490 - + ls-tree: use a "struct options"
491 - + ls-tree: don't use "show_tree_data" for "fast" callbacks
492 -
493 - Code clean-up.
494 -
495 - Will merge to 'master'.
496 - source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
497 -
498 -
499 -* yc/doc-fetch-fix (2023-01-13) 1 commit
500 - (merged to 'next' on 2023-01-14 at a3ca60840b)
501 - + doc: fix non-existent config name
502 -
503 - Doc fix.
504 -
505 - Will merge to 'master'.
506 - source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
507 -
508 -
509 -* jc/ci-deprecated-declarations-are-not-fatal (2023-01-14) 1 commit
510 - (merged to 'next' on 2023-01-14 at 5efb778ab0)
511 - + ci: do not die on deprecated-declarations warning
512 -
513 - CI build fix for overzealous -Werror.
514 -
515 - Will merge to 'master'.
516 - source: <xmqq7cxpkpjp.fsf@gitster.g>
662 + Expecting a (hopefully final) reroll.
663 + cf. <c1ba0a28-3c39-b313-2757-dceb02930334@amd.com>
664 + source: <20230120012459.920932-1-michael.strawbridge@amd.com>
665
666
667 * ds/bundle-uri-5 (2023-01-07) 8 commits
@@ -529,78 +677,33 @@ Release tarballs are available at:
677 The bundle-URI subsystem adds support for creation-token heuristics
678 to help incremental fetches.
679
532 - Needs review.
680 + Expecting a reroll.
681 + cf. <4e2ac966-0f45-8018-ff8f-3831ea0c3c2e@github.com>
682 source: <pull.1454.git.1673037405.gitgitgadget@gmail.com>
683
684
536 -* jk/read-object-cleanup (2023-01-13) 6 commits
537 - (merged to 'next' on 2023-01-13 at 8cbeef4abd)
538 - + object-file: fix indent-with-space
539 - (merged to 'next' on 2023-01-09 at 19cc3de33e)
540 - + packfile: inline custom read_object()
541 - + repo_read_object_file(): stop wrapping read_object_file_extended()
542 - + read_object_file_extended(): drop lookup_replace option
543 - + streaming: inline call to read_object_file_extended()
544 - + object-file: inline calls to read_object()
545 -
546 - Code clean-up.
547 -
548 - Will merge to 'master'.
549 - source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
550 -
551 -
552 -* pb/doc-orig-head (2023-01-13) 5 commits
553 - (merged to 'next' on 2023-01-14 at 0583c146cb)
554 - + git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
555 - + revisions.txt: be explicit about commands writing 'ORIG_HEAD'
556 - + git-merge.txt: mention 'ORIG_HEAD' in the Description
557 - + git-reset.txt: mention 'ORIG_HEAD' in the Description
558 - + git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
559 -
560 - Document ORIG_HEAD a bit more.
561 -
562 - Will merge to 'master'.
563 - source: <pull.1456.v2.git.1673356521.gitgitgadget@gmail.com>
564 -
565 -
685 * tc/cat-file-z-use-cquote (2023-01-16) 1 commit
686 - cat-file: quote-format name in error when using -z
687
688 "cat-file" in the batch mode that is fed NUL-terminated pathnames
689 learned to cquote them in its error output (otherwise, a funny
690 pathname with LF in it would break the lines in the output stream).
691 +
692 + Expecting a reroll.
693 + cf. <2a2a46f0-a9bc-06a6-72e1-28800518777c@dunelm.org.uk>
694 source: <20230116190749.4141516-1-toon@iotcl.com>
695
696
575 -* cb/grep-pcre-ucp (2023-01-09) 1 commit
576 - - grep: correctly identify utf-8 characters with \{b,w} in -P
697 +* cb/grep-pcre-ucp (2023-01-18) 1 commit
698 + (merged to 'next' on 2023-01-19 at 2c7e531839)
699 + + grep: correctly identify utf-8 characters with \{b,w} in -P
700
701 "grep -P" learned to use Unicode Character Property to grok
702 character classes when processing \b and \w etc.
703
581 - Still skeptical.
582 - cf. <230109.86v8lf297g.gmgdl@evledraar.gmail.com>
583 - source: <20230108155217.2817-1-carenas@gmail.com>
584 -
585 -
586 -* es/hooks-and-local-env (2023-01-13) 1 commit
587 - (merged to 'next' on 2023-01-14 at 93acd89393)
588 - + githooks: discuss Git operations in foreign repositories
589 -
590 - Doc update for environment variables set when hooks are invoked.
591 -
704 Will merge to 'master'.
593 - source: <pull.1457.v2.git.1673293508399.gitgitgadget@gmail.com>
594 -
595 -
596 -* ph/parse-date-reduced-precision (2023-01-13) 1 commit
597 - (merged to 'next' on 2023-01-14 at eb83564c3e)
598 - + date.c: allow ISO 8601 reduced precision times
599 -
600 - Loosen date parsing heuristics.
601 -
602 - Will merge to 'master'.
603 - source: <20230111001003.10916-1-congdanhqx@gmail.com>
705 + cf. <xmqqzgaf2zpt.fsf@gitster.g>
706 + source: <20230108155217.2817-1-carenas@gmail.com>
707
708
709 * rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
@@ -616,21 +719,19 @@ Release tarballs are available at:
719 source: <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
720
721
619 -* cw/submodule-status-in-parallel (2023-01-05) 6 commits
620 - . submodule: call parallel code from serial status
621 - . diff-lib: parallelize run_diff_files for submodules
622 - . diff-lib: refactor match_stat_with_submodule
623 - . submodule: move status parsing into function
624 - . submodule: strbuf variable rename
625 - . run-command: add duplicate_output_fn to run_processes_parallel_opts
722 +* cw/submodule-status-in-parallel (2023-01-17) 6 commits
723 + - submodule: call parallel code from serial status
724 + - diff-lib: parallelize run_diff_files for submodules
725 + - diff-lib: refactor match_stat_with_submodule
726 + - submodule: move status parsing into function
727 + - submodule: strbuf variable rename
728 + - run-command: add duplicate_output_fn to run_processes_parallel_opts
729
730 "git submodule status" learned to run the comparison in submodule
731 repositories in parallel.
732
733 Needs review.
631 - Breaks "linux-leaks" CI job.
632 - cf. <xmqqv8l8f8j8.fsf@gitster.g>
633 - source: <https://lore.kernel.org/git/20221108184200.2813458-1-calvinwan@google.com/>
734 + source: <20230104215415.1083526-1-calvinwan@google.com>
735
736
737 * kn/attr-from-tree (2023-01-14) 2 commits
@@ -645,14 +746,14 @@ Release tarballs are available at:
746 source: <cover.1673684790.git.karthik.188@gmail.com>
747
748
648 -* ab/various-leak-fixes (2023-01-14) 19 commits
749 +* ab/various-leak-fixes (2023-01-18) 19 commits
750 - push: free_refs() the "local_refs" in set_refspecs()
751 - receive-pack: free() the "ref_name" in "struct command"
752 - grep API: plug memory leaks by freeing "header_list"
753 - grep.c: refactor free_grep_patterns()
754 - object-file.c: release the "tag" in check_tag()
755 - builtin/merge.c: free "&buf" on "Your local changes..." error
655 - - builtin/merge.c: always free "struct strbuf msg"
756 + - builtin/merge.c: use fixed strings, not "strbuf", fix leak
757 - show-branch: free() allocated "head" before return
758 - commit-graph: fix a parse_options_concat() leak
759 - http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
@@ -668,32 +769,21 @@ Release tarballs are available at:
769
770 Leak fixes.
771
671 - Will merge to 'next'?
672 - source: <cover-v3-00.19-00000000000-20230110T054138Z-avarab@gmail.com>
772 + Needs review.
773 + source: <cover-v5-00.19-00000000000-20230118T120334Z-avarab@gmail.com>
774
775
675 -* rj/branch-unborn-in-other-worktrees (2023-01-01) 2 commits
776 +* rj/branch-unborn-in-other-worktrees (2023-01-19) 3 commits
777 - branch: rename orphan branches in any worktree
778 - branch: description for orphan branch errors
779 + - avoid unnecessary worktrees traversing
780
781 Error messages given when working on an unborn branch that is
782 checked out in another worktree have been improvved.
681 - source: <ffd675e9-8a64-ae05-fc3b-36ae99092735@gmail.com>
682 -
783
684 -* rs/dup-array (2023-01-09) 5 commits
685 - (merged to 'next' on 2023-01-14 at 3efbd1ffe0)
686 - + use DUP_ARRAY
687 - + add DUP_ARRAY
688 - + do full type check in BARF_UNLESS_COPYABLE
689 - + factor out BARF_UNLESS_COPYABLE
690 - + mingw: make argv2 in try_shell_exec() non-const
691 -
692 - Code cleaning.
693 -
694 - Will merge to 'master'.
695 - source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
696 - source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
784 + Expecting a reroll.
785 + cf. <527f7315-be7b-7ec0-04fc-d07da7d4fefa@gmail.com>
786 + source: <34a58449-4f2e-66ef-ea01-119186aebd23@gmail.com>
787
788
789 * ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
@@ -724,26 +814,15 @@ Release tarballs are available at:
814 source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
815
816
727 -* jx/t1301-updates (2022-11-30) 3 commits
728 - (merged to 'next' on 2023-01-14 at d4f081b3f8)
729 - + t1301: do not change $CWD in "shared=all" test case
730 - + t1301: use test_when_finished for cleanup
731 - + t1301: fix wrong template dir for git-init
732 -
733 - Test updates.
734 -
735 - Will merge to 'master'.
736 - source: <20221128130323.8914-1-worldhello.net@gmail.com>
737 -
738 -
817 * km/send-email-with-v-reroll-count (2022-11-27) 1 commit
740 - - send-email: relay '-v N' to format-patch
818 + (merged to 'next' on 2023-01-19 at 9b3543471c)
819 + + send-email: relay '-v N' to format-patch
820
821 "git send-email -v 3" used to be expanded to "git send-email
822 --validate 3" when the user meant to pass them down to
823 "format-patch", which has been corrected.
824
746 - Will merge to 'next'?
825 + Will merge to 'master'.
826 source: <87edtp5uws.fsf@kyleam.com>
827
828
@@ -774,18 +853,41 @@ Release tarballs are available at:
853 source: <20221221040446.2860985-1-christian.couder@gmail.com>
854
855
777 -* mc/credential-helper-auth-headers (2022-12-13) 8 commits
778 - - t5556: add HTTP authentication tests
856 +* 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
784 - - credential: add WWW-Authenticate header to cred requests
785 - - http: read HTTP WWW-Authenticate response headers
866 + - daemon: rename some esoteric/laboured terminology
867 + - daemon: libify child process handling functions
868 + - daemon: libify socket setup and option functions
869
870 Extending credential helper protocol.
871
789 - Waiting for review responses (or a reroll).
790 - cf. <1dc44716-2550-47de-e666-9972b102905d@github.com>
791 - source: <pull.1352.v4.git.1670880984.gitgitgadget@gmail.com>
872 + Needs review.
873 + source: <pull.1352.v7.git.1674252530.gitgitgadget@gmail.com>
874 +
875 +--------------------------------------------------
876 +[Discarded]
877 +
878 +* jc/ci-deprecated-declarations-are-not-fatal (2023-01-14) 1 commit
879 + (merged to 'next' on 2023-01-14 at 5efb778ab0)
880 + + ci: do not die on deprecated-declarations warning
881 +
882 + CI build fix for overzealous -Werror.
883 +
884 + Reverted out of 'next'
885 + Preferring jk/curl-avoid-deprecated-api that fixes the code properly.
886 + source: <xmqq7cxpkpjp.fsf@gitster.g>
887 +
888 +
889 +* po/pretty-hard-trunc (2022-11-13) 1 commit
890 + . pretty-formats: add hard truncation, without ellipsis, options
891 +
892 + Add a new pretty format which truncates without ellipsis.
893 + source: <20221112143616.1429-1-philipoakley@iee.email>