]>
Commit | Line | Data |
---|---|---|
76feac43 | 1 | To: git@vger.kernel.org |
7ff8a6d0 JH |
2 | Subject: What's cooking in git.git (Aug 2023, #04; Thu, 10) |
3 | X-master-at: fac96dfbb1c24369ba7d37a5affd8adfe6c650fd | |
4 | X-next-at: 551eb34607c0f3837c0a567622e251f9ea1cdc27 | |
cb290473 | 5 | Bcc: lwn@lwn.net, gitster@pobox.com |
cb4ead20 | 6 | |
7ff8a6d0 | 7 | What's cooking in git.git (Aug 2023, #04; Thu, 10) |
a347bca3 | 8 | -------------------------------------------------- |
7d77f2e9 | 9 | |
4b704895 | 10 | Here are the topics that have been cooking in my tree. Commits |
6b8507d9 | 11 | prefixed with '+' are in 'next' (being in 'next' is a sign that a |
b328e8d1 JH |
12 | topic is stable enough to be used and are candidate to be in a |
13 | future release). Commits prefixed with '-' are only in 'seen', and | |
14 | aren't considered "accepted" at all and may be annotated with an URL | |
15 | to a message that raises issues but they are no means exhaustive. A | |
08b117fe | 16 | topic without enough support may be discarded after a long period of |
b328e8d1 JH |
17 | no activity (of course they can be resubmit when new interests |
18 | arise). | |
8f153922 | 19 | |
7ff8a6d0 JH |
20 | Git 2.42-rc1 has been tagged. From here on, the 'master' front is |
21 | expected to merge only fixes for new regressions that happened in | |
22 | this cycle, while other topics will wait in 'next' or on the mailing | |
23 | list for their turn after the release is done. | |
1bbcd54e | 24 | |
fc403878 | 25 | Copies of the source code to Git live in many repositories, and the |
06ab6b89 JH |
26 | following is a list of the ones I push into or their mirrors. Some |
27 | repositories have only a subset of branches. | |
1b1372cb | 28 | |
6f396020 | 29 | With maint, master, next, seen, todo: |
2ecaec89 | 30 | |
6f396020 JH |
31 | git://git.kernel.org/pub/scm/git/git.git/ |
32 | git://repo.or.cz/alt-git.git/ | |
33 | https://kernel.googlesource.com/pub/scm/git/git/ | |
431813a4 | 34 | https://github.com/git/git/ |
06ab6b89 | 35 | https://gitlab.com/git-vcs/git/ |
6f396020 | 36 | |
a0e3e70e JH |
37 | With all the integration branches and topics broken out: |
38 | ||
431813a4 | 39 | https://github.com/gitster/git/ |
a0e3e70e JH |
40 | |
41 | Even though the preformatted documentation in HTML and man format | |
431813a4 JH |
42 | are not sources, they are published in these repositories for |
43 | convenience (replace "htmldocs" with "manpages" for the manual | |
44 | pages): | |
a0e3e70e JH |
45 | |
46 | git://git.kernel.org/pub/scm/git/git-htmldocs.git/ | |
47 | https://github.com/gitster/git-htmldocs.git/ | |
48 | ||
431813a4 | 49 | Release tarballs are available at: |
a0e3e70e | 50 | |
6b8507d9 JH |
51 | https://www.kernel.org/pub/software/scm/git/ |
52 | ||
a591f232 | 53 | -------------------------------------------------- |
1bbcd54e | 54 | [Graduated to 'master'] |
c486f9e6 | 55 | |
7ff8a6d0 JH |
56 | * bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit |
57 | (merged to 'next' on 2023-08-03 at e786442a9b) | |
58 | + ident: don't consider '.' a crud | |
21dd98b2 | 59 | |
7ff8a6d0 JH |
60 | Exclude "." from the set of characters to be removed from the |
61 | beginning and the end of the human-readable name. | |
62 | source: <xmqqsf918k4j.fsf@gitster.g> | |
0e87def2 | 63 | |
0e87def2 | 64 | |
7ff8a6d0 JH |
65 | * bc/ignore-clangd-cache (2023-08-04) 1 commit |
66 | (merged to 'next' on 2023-08-04 at 5cf8d41911) | |
67 | + gitignore: ignore clangd .cache directory | |
0e87def2 | 68 | |
7ff8a6d0 JH |
69 | .gitignore update. |
70 | source: <20230804171328.1737188-1-sandals@crustytoothpaste.net> | |
0e87def2 | 71 | |
c486f9e6 | 72 | |
7ff8a6d0 JH |
73 | * ew/hash-with-openssl-evp (2023-08-01) 2 commits |
74 | (merged to 'next' on 2023-08-02 at 996db74865) | |
75 | + avoid SHA-1 functions deprecated in OpenSSL 3+ | |
76 | + sha256: avoid functions deprecated in OpenSSL 3+ | |
c486f9e6 | 77 | |
7ff8a6d0 JH |
78 | Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on |
79 | its traditional API, by using its EVP API instead. | |
80 | source: <20230801025454.1137802-1-e@80x24.org> | |
c486f9e6 | 81 | |
c486f9e6 | 82 | |
7ff8a6d0 JH |
83 | * ma/locate-in-path-for-windows (2023-08-04) 3 commits |
84 | (merged to 'next' on 2023-08-06 at 02bc13f4a3) | |
85 | + docs: update when `git bisect visualize` uses `gitk` | |
86 | + compat/mingw: implement a native locate_in_PATH() | |
87 | + run-command: conditionally define locate_in_PATH() | |
88 | ||
89 | "git bisect visualize" stopped running "gitk" on Git for Windows | |
90 | when the command was reimplemented in C around Git 2.34 timeframe. | |
91 | This has been corrected. | |
92 | source: <pull.1560.v2.git.1691122124.gitgitgadget@gmail.com> | |
c486f9e6 | 93 | |
7ff8a6d0 JH |
94 | |
95 | * pw/rebase-skip-commit-message-fix (2023-08-03) 1 commit | |
96 | (merged to 'next' on 2023-08-06 at 1e44443e65) | |
97 | + rebase --skip: fix commit message clean up when skipping squash | |
98 | ||
99 | "git rebase -i" with a series of squash/fixup, when one of the | |
100 | steps stopped in conflicts and ended up getting skipped, did not | |
101 | handle the accumulated commit log messages, which has been | |
102 | corrected. | |
103 | source: <pull.1558.git.git.1691068176051.gitgitgadget@gmail.com> | |
c486f9e6 | 104 | |
21dd98b2 JH |
105 | -------------------------------------------------- |
106 | [New Topics] | |
c486f9e6 | 107 | |
7ff8a6d0 JH |
108 | * ds/maintenance-on-windows-fix (2023-08-09) 2 commits |
109 | (merged to 'next' on 2023-08-09 at 3d7abef9be) | |
110 | + git maintenance: avoid console window in scheduled tasks on Windows | |
111 | + win32: add a helper to run `git.exe` without a foreground window | |
c486f9e6 | 112 | |
7ff8a6d0 | 113 | Windows updates. |
c486f9e6 | 114 | |
7ff8a6d0 JH |
115 | Will merge to 'master'. |
116 | source: <pull.1570.git.1691600087.gitgitgadget@gmail.com> | |
c486f9e6 | 117 | |
1bbcd54e | 118 | |
7ff8a6d0 JH |
119 | * jc/send-email-pre-process-fix (2023-08-09) 1 commit |
120 | (merged to 'next' on 2023-08-09 at ba1b999ec2) | |
121 | + t9001: remove excessive GIT_SEND_EMAIL_NOTTY=1 | |
1bbcd54e | 122 | |
7ff8a6d0 | 123 | Test fix. |
1bbcd54e | 124 | |
7ff8a6d0 JH |
125 | Will merge to 'master'. |
126 | source: <20230809171531.2564754-1-oswald.buddenhagen@gmx.de> | |
0e87def2 | 127 | |
0e87def2 | 128 | |
7ff8a6d0 JH |
129 | * ob/sequencer-rearrange-cleanup (2023-08-09) 1 commit |
130 | (merged to 'next' on 2023-08-09 at df4360945c) | |
131 | + sequencer: simplify allocation of result array in todo_list_rearrange_squash() | |
0e87def2 | 132 | |
7ff8a6d0 | 133 | Code clean-up. |
0e87def2 | 134 | |
7ff8a6d0 JH |
135 | Will cook in 'next'. |
136 | source: <20230809171532.2564880-1-oswald.buddenhagen@gmx.de> | |
0e87def2 | 137 | |
0e87def2 | 138 | |
7ff8a6d0 JH |
139 | * st/mv-lstat-fix (2023-08-09) 1 commit |
140 | (merged to 'next' on 2023-08-09 at 4b5708df7c) | |
141 | + mv: handle lstat() failure correctly | |
0e87def2 | 142 | |
7ff8a6d0 JH |
143 | Correct use of lstat() that assumed a failing call would not |
144 | clobber the statbuf. | |
0e87def2 | 145 | |
7ff8a6d0 JH |
146 | Will merge to 'master'. |
147 | source: <pull.1561.v2.git.1691567261701.gitgitgadget@gmail.com> | |
0e87def2 | 148 | |
0e87def2 | 149 | |
7ff8a6d0 JH |
150 | * tb/repack-geometry-cleanup (2023-08-09) 1 commit |
151 | - repack: move `pack_geometry` struct to the stack | |
152 | (this branch uses jk/repack-leakfix.) | |
350fafa9 | 153 | |
7ff8a6d0 | 154 | Code clean-up. |
1bbcd54e | 155 | |
21dd98b2 | 156 | Will merge to 'next'. |
7ff8a6d0 | 157 | source: <cover.1691613149.git.me@ttaylorr.com> |
1bbcd54e | 158 | |
1bbcd54e | 159 | |
7ff8a6d0 JH |
160 | * ws/git-push-doc-grammofix (2023-08-09) 1 commit |
161 | - git-push.txt: fix grammar | |
1bbcd54e | 162 | |
7ff8a6d0 | 163 | Doc update. |
1bbcd54e | 164 | |
21dd98b2 | 165 | Will merge to 'next'. |
7ff8a6d0 | 166 | source: <20230810012105.1423462-1-wesleys@opperschaap.net> |
c486f9e6 | 167 | |
21dd98b2 | 168 | |
7ff8a6d0 JH |
169 | * ws/svn-with-new-readline (2023-08-09) 1 commit |
170 | - git-svn: avoid creating more than one than one Term::ReadLine object | |
171 | (this branch uses jk/send-email-with-new-readline.) | |
21dd98b2 | 172 | |
7ff8a6d0 JH |
173 | Adjust to newer Term::ReadLine to prevent it from breaking |
174 | the interactive prompt code in git-svn. | |
c486f9e6 | 175 | |
7ff8a6d0 JH |
176 | Will merge to 'next' and then to 'master'. |
177 | source: <20230810011831.1423208-1-wesleys@opperschaap.net> | |
1bbcd54e JH |
178 | |
179 | ||
7ff8a6d0 JH |
180 | * ak/pretty-decorate-more (2023-08-10) 7 commits |
181 | - pretty: add pointer and tag options to %(decorate) | |
182 | - pretty: add %(decorate[:<options>]) format | |
183 | - decorate: color each token separately | |
184 | - decorate: avoid some unnecessary color overhead | |
185 | - decorate: refactor format_decorations() | |
186 | - pretty-formats: enclose options in angle brackets | |
187 | - pretty-formats: define "literal formatting code" | |
21dd98b2 | 188 | |
7ff8a6d0 | 189 | Teach "git log --format" a customizable %(decorate) placeholder. |
21dd98b2 | 190 | |
7ff8a6d0 JH |
191 | Needs review. |
192 | source: <20230715160730.4046-1-andy.koppe@gmail.com> | |
21dd98b2 JH |
193 | |
194 | ||
7ff8a6d0 JH |
195 | * ds/upload-pack-error-sequence-fix (2023-08-10) 1 commit |
196 | - upload-pack: fix race condition in error messages | |
21dd98b2 | 197 | |
7ff8a6d0 | 198 | Error message generation fix. |
21dd98b2 | 199 | |
7ff8a6d0 JH |
200 | Will merge to 'next'. |
201 | source: <pull.1572.git.1691678450757.gitgitgadget@gmail.com> | |
21dd98b2 JH |
202 | |
203 | ||
7ff8a6d0 JH |
204 | * mp/rebase-label-length-limit (2023-08-10) 2 commits |
205 | - rebase: allow overriding the maximal length of the generated labels | |
206 | - sequencer: truncate labels to accommodate loose refs | |
21dd98b2 | 207 | |
7ff8a6d0 | 208 | Chomp overly long label names used in the sequencer machinery. |
21dd98b2 | 209 | |
7ff8a6d0 JH |
210 | Will merge to 'next'. |
211 | source: <pull.1562.git.git.1691685300.gitgitgadget@gmail.com> | |
c486f9e6 | 212 | |
21dd98b2 | 213 | |
7ff8a6d0 JH |
214 | * pw/diff-no-index-from-named-pipes (2023-08-10) 1 commit |
215 | - t4053: avoid race when killing background processes | |
21dd98b2 JH |
216 | |
217 | Test updates. | |
c486f9e6 | 218 | |
7ff8a6d0 JH |
219 | Will merge to 'next'? |
220 | source: <pull.1571.git.1691677993195.gitgitgadget@gmail.com> | |
c486f9e6 JH |
221 | |
222 | ||
7ff8a6d0 JH |
223 | * tb/commit-graph-verify-fix (2023-08-10) 4 commits |
224 | - commit-graph: invert negated conditional | |
225 | - t/t5318-commit-graph.sh: test generation zero transitions during fsck | |
226 | - commit-graph: verify swapped zero/non-zero generation cases | |
227 | - commit-graph: introduce `commit_graph_generation_from_graph()` | |
c486f9e6 | 228 | |
7ff8a6d0 JH |
229 | Update commit-graph verification code that detects mixture of zero |
230 | and non-zero generation numbers. | |
c486f9e6 | 231 | |
21dd98b2 | 232 | Will merge to 'next'. |
7ff8a6d0 | 233 | source: <cover.1691699851.git.me@ttaylorr.com> |
c486f9e6 JH |
234 | |
235 | -------------------------------------------------- | |
236 | [Stalled] | |
237 | ||
21dd98b2 JH |
238 | * sl/sparse-check-attr (2023-07-18) 3 commits |
239 | - check-attr: integrate with sparse-index | |
240 | - attr.c: read attributes in a sparse directory | |
241 | - t1092: add tests for 'git check-attr' | |
0e87def2 | 242 | |
21dd98b2 | 243 | Teach "git check-attr" work better with sparse-index. |
0e87def2 | 244 | |
21dd98b2 JH |
245 | Expecting a reroll. |
246 | cf. <c3ebe3b4-88b9-8ca2-2ee3-39a3e0d82201@github.com> | |
247 | cf. <5e478d8b-9ef4-864b-41e4-e0a79877d278@github.com> | |
248 | source: <20230718232916.31660-1-cheskaqiqi@gmail.com> | |
0e87def2 JH |
249 | |
250 | ||
251 | * cc/git-replay (2023-06-03) 15 commits | |
252 | - replay: stop assuming replayed branches do not diverge | |
253 | - replay: add --contained to rebase contained branches | |
254 | - replay: add --advance or 'cherry-pick' mode | |
255 | - replay: disallow revision specific options and pathspecs | |
256 | - replay: use standard revision ranges | |
257 | - replay: make it a minimal server side command | |
258 | - replay: remove HEAD related sanity check | |
259 | - replay: remove progress and info output | |
260 | - replay: add an important FIXME comment about gpg signing | |
261 | - replay: don't simplify history | |
262 | - replay: introduce pick_regular_commit() | |
263 | - replay: die() instead of failing assert() | |
264 | - replay: start using parse_options API | |
265 | - replay: introduce new builtin | |
266 | - t6429: remove switching aspects of fast-rebase | |
267 | ||
268 | No reviews? | |
269 | source: <20230602102533.876905-1-christian.couder@gmail.com> | |
270 | ||
271 | ||
c486f9e6 JH |
272 | * tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit |
273 | - cherry-pick: refuse cherry-pick sequence if index is dirty | |
274 | ||
275 | "git cherry-pick A" that replays a single commit stopped before | |
276 | clobbering local modification, but "git cherry-pick A..B" did not, | |
277 | which has been corrected. | |
278 | ||
279 | Expecting a reroll. | |
280 | cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com> | |
281 | source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com> | |
282 | ||
283 | ||
284 | * ab/tag-object-type-errors (2023-05-10) 4 commits | |
285 | - tag: don't emit potentially incorrect "object is a X, not a Y" | |
286 | - tag: don't misreport type of tagged objects in errors | |
287 | - object tests: add test for unexpected objects in tags | |
288 | - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors | |
289 | ||
290 | Hardening checks around mismatched object types when one of those | |
291 | objects is a tag. | |
292 | ||
293 | Will discard. | |
294 | Stalled for too long. | |
295 | source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com> | |
296 | ||
0e87def2 JH |
297 | -------------------------------------------------- |
298 | [Cooking] | |
c486f9e6 | 299 | |
7ff8a6d0 JH |
300 | * la/trailer-cleanups (2023-08-06) 5 commits |
301 | - trailer: rename *_DEFAULT enums to *_UNSPECIFIED | |
302 | - trailer: teach find_patch_start about --no-divider | |
303 | - trailer: split process_command_line_args into separate functions | |
304 | - trailer: split process_input_file into separate pieces | |
305 | - trailer: separate public from internal portion of trailer_iterator | |
306 | ||
307 | Code clean-up. | |
308 | ||
309 | Needs review. | |
310 | source: <pull.1563.git.1691211879.gitgitgadget@gmail.com> | |
311 | ||
312 | ||
313 | * la/trailer-test-and-doc-updates (2023-08-10) 14 commits | |
314 | - SQUASH??? | |
315 | - trailer doc: <token> is a <key> or <keyAlias>, not both | |
316 | - trailer doc: separator within key suppresses default separator | |
317 | - trailer doc: emphasize the effect of configuration variables | |
318 | - trailer --unfold help: prefer "reformat" over "join" | |
319 | - trailer --parse docs: add explanation for its usefulness | |
320 | - trailer --only-input: prefer "configuration variables" over "rules" | |
321 | - trailer --parse help: expose aliased options | |
322 | - trailer --no-divider help: describe usual "---" meaning | |
323 | - trailer: trailer location is a place, not an action | |
324 | - trailer doc: narrow down scope of --where and related flags | |
325 | - trailer: add tests to check defaulting behavior with --no-* flags | |
326 | - trailer test description: this tests --where=after, not --where=before | |
327 | - trailer tests: make test cases self-contained | |
328 | ||
329 | Test coverage improvement for trailers. | |
330 | ||
331 | Needs review. | |
332 | source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com> | |
333 | ||
334 | ||
335 | * jk/repack-leakfix (2023-08-08) 1 commit | |
336 | (merged to 'next' on 2023-08-09 at 8692d7b2e0) | |
337 | + repack: free geometry struct | |
338 | (this branch is used by tb/repack-geometry-cleanup.) | |
339 | ||
340 | Leakfix. | |
341 | ||
342 | Will merge to 'master'. | |
343 | source: <20230808185023.GA3498623@coredump.intra.peff.net> | |
344 | ||
345 | ||
346 | * jk/send-email-with-new-readline (2023-08-08) 2 commits | |
347 | (merged to 'next' on 2023-08-09 at d42e4ca9f8) | |
348 | + send-email: avoid creating more than one Term::ReadLine object | |
349 | + send-email: drop FakeTerm hack | |
350 | (this branch is used by ws/svn-with-new-readline.) | |
351 | ||
352 | Adjust to newer Term::ReadLine to prevent it from breaking | |
353 | the interactive prompt code in send-email. | |
354 | ||
355 | Will merge to 'master'. | |
356 | source: <20230808180935.GA2096901@coredump.intra.peff.net> | |
357 | ||
358 | ||
359 | * js/allow-t4000-to-be-indented-with-spaces (2023-08-08) 1 commit | |
360 | (merged to 'next' on 2023-08-09 at 9c0d6659ec) | |
361 | + t0040: declare non-tab indentation to be okay in this script | |
362 | ||
363 | File attribute update. | |
364 | ||
365 | Will merge to 'master'. | |
366 | source: <pull.1568.git.1691491054706.gitgitgadget@gmail.com> | |
367 | ||
368 | ||
369 | * ob/rebase-conflict-advice-i18n-fix (2023-08-07) 1 commit | |
370 | (merged to 'next' on 2023-08-09 at 0e02113510) | |
371 | + advice: handle "rebase" in error_resolve_conflict() | |
372 | ||
373 | i18n coverage improvement and avoidance of sentence lego. | |
374 | ||
375 | Will merge to 'master'. | |
376 | source: <20230807170935.2336715-1-oswald.buddenhagen@gmx.de> | |
377 | ||
378 | ||
379 | * rs/parse-opt-forbid-set-int-0-without-noneg (2023-08-08) 1 commit | |
380 | (merged to 'next' on 2023-08-09 at fab1193dbc) | |
381 | + parse-options: disallow negating OPTION_SET_INT 0 | |
382 | ||
383 | Developer support to detect meaningless combination of options. | |
384 | ||
385 | Will merge to 'master'. | |
386 | source: <c4cd1591-3a83-920a-6a80-19ffbfe3089d@web.de> | |
387 | ||
388 | ||
389 | * ds/maintenance-schedule-fuzz (2023-08-10) 8 commits | |
390 | - maintenance: update schedule before config | |
391 | - maintenance: fix systemd schedule overlaps | |
392 | - maintenance: use random minute in systemd scheduler | |
393 | - maintenance: swap method locations | |
394 | - maintenance: use random minute in cron scheduler | |
395 | - maintenance: use random minute in Windows scheduler | |
396 | - maintenance: use random minute in launchctl scheduler | |
397 | - maintenance: add get_random_minute() | |
398 | ||
399 | Allow "git maintenance" schedule to be randomly distributed. | |
400 | ||
401 | Looking good. | |
402 | source: <pull.1567.v2.git.1691699987.gitgitgadget@gmail.com> | |
403 | ||
404 | ||
405 | * ob/send-email-interactive-failure (2023-08-09) 1 commit | |
406 | . send-email: prompt-dependent exit codes | |
407 | ||
408 | "git send-email" exits with non-zero status when end-user | |
409 | interaction causes any prepared message not to be sent. | |
410 | ||
411 | Expecting a reroll. | |
412 | Without an opt-in fix, this will be a backward-incompatible | |
413 | change that needs mention in the release notes. | |
414 | source: <20230809171531.2564739-1-oswald.buddenhagen@gmx.de> | |
415 | ||
416 | ||
417 | * ob/sequencer-empty-hint-fix (2023-08-09) 1 commit | |
418 | . sequencer: rectify empty hint in call of require_clean_work_tree() | |
419 | ||
420 | Update the use of API for consistency between two calls to | |
421 | require_clean_work_tree() from the sequencer code. | |
422 | ||
423 | source: <20230809171531.2564829-1-oswald.buddenhagen@gmx.de> | |
424 | ||
425 | ||
426 | * rj/branch-in-use-error-message (2023-08-08) 2 commits | |
427 | (merged to 'next' on 2023-08-09 at 5510985b1c) | |
428 | + branch: error message checking out a branch in use | |
429 | + branch: error message deleting a branch in use | |
430 | ||
431 | A message written in olden time prevented a branch from getting | |
432 | checked out saying it is already checked out elsewhere, but these | |
433 | days, we treat a branch that is being bisected or rebased just like | |
434 | a branch that is checked out and protect it. Rephrase the message | |
435 | to say that the branch is in use. | |
436 | ||
437 | Will cook in 'next'. | |
438 | source: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com> | |
439 | ||
440 | ||
21dd98b2 JH |
441 | * mh/credential-libsecret-attrs (2023-06-16) 1 commit |
442 | (merged to 'next' on 2023-08-08 at dc73a2c55a) | |
443 | + credential/libsecret: store new attributes | |
444 | ||
445 | The way authentication related data other than passwords (e.g. | |
446 | oath token and password expiration data) are stored in libsecret | |
447 | keyrings has been rethought. | |
448 | ||
449 | Will cook in 'next'. | |
450 | Needs review. | |
451 | source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com> | |
452 | ||
453 | ||
454 | * jc/rerere-cleanup (2023-08-03) 5 commits | |
455 | - rerere: plug small strbuf leak | |
456 | - rerere: modernize use of empty strbuf | |
457 | - rerere: try_merge() should use LL_MERGE_ERROR when it means an error | |
458 | - rerere: fix comment on handle_file() helper | |
459 | - rerere: simplify check_one_conflict() helper function | |
460 | (this branch uses jc/unresolve-removal.) | |
461 | ||
462 | Code clean-up. | |
463 | ||
464 | Not ready to be reviewed yet. | |
465 | source: <20230731224409.4181277-1-gitster@pobox.com> | |
466 | ||
467 | ||
1bbcd54e | 468 | * pw/rebase-i-after-failure (2023-08-01) 7 commits |
c486f9e6 | 469 | - rebase -i: fix adding failed command to the todo list |
c486f9e6 | 470 | - rebase --continue: refuse to commit after failed command |
1bbcd54e | 471 | - rebase: fix rewritten list for failed pick |
c486f9e6 | 472 | - sequencer: factor out part of pick_commits() |
1bbcd54e | 473 | - sequencer: use rebase_path_message() |
c486f9e6 JH |
474 | - rebase -i: remove patch file after conflict resolution |
475 | - rebase -i: move unlink() calls | |
476 | ||
477 | Various fixes to the behaviour of "rebase -i" when the command got | |
478 | interrupted by conflicting changes. | |
479 | ||
0e87def2 JH |
480 | Expecting a reroll. |
481 | The latter half of the series should be reviewed by those who have | |
482 | more stake in the sequencer code than myself. | |
483 | cf. <619e458b-218b-a790-dfb4-9200e201b513@gmail.com> | |
1bbcd54e | 484 | source: <pull.1492.v3.git.1690903412.gitgitgadget@gmail.com> |
c486f9e6 | 485 | |
0e87def2 | 486 | |
0e87def2 JH |
487 | * jc/unresolve-removal (2023-07-31) 7 commits |
488 | - checkout: allow "checkout -m path" to unmerge removed paths | |
489 | - checkout/restore: add basic tests for --merge | |
490 | - checkout/restore: refuse unmerging paths unless checking out of the index | |
491 | - update-index: remove stale fallback code for "--unresolve" | |
492 | - update-index: use unmerge_index_entry() to support removal | |
493 | - resolve-undo: allow resurrecting conflicted state that resolved to deletion | |
494 | - update-index: do not read HEAD and MERGE_HEAD unconditionally | |
495 | (this branch is used by jc/rerere-cleanup.) | |
496 | ||
497 | "checkout --merge -- path" and "update-index --unresolve path" did | |
498 | not resurrect conflicted state that was resolved to remove path, | |
499 | but now they do. | |
500 | ||
501 | Needs review. | |
502 | source: <20230731224409.4181277-1-gitster@pobox.com> | |
503 | ||
504 | ||
0e87def2 JH |
505 | * rj/status-bisect-while-rebase (2023-08-01) 1 commit |
506 | - status: fix branch shown when not only bisecting | |
507 | ||
508 | "git status" is taught to show both the branch being bisected and | |
509 | being rebased when both are in effect at the same time. | |
510 | ||
511 | Needs review. | |
512 | source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com> | |
513 | ||
c486f9e6 | 514 | |
21dd98b2 JH |
515 | * rs/parse-options-negation-help (2023-08-06) 8 commits |
516 | - parse-options: simplify usage_padding() | |
517 | - parse-options: no --[no-]no-... | |
518 | - parse-options: factor out usage_indent() and usage_padding() | |
cdae5367 JH |
519 | - parse-options: show negatability of options in short help |
520 | - t1502: test option negation | |
521 | - t1502: move optionspec help output to a file | |
522 | - t1502, docs: disallow --no-help | |
523 | - subtree: disallow --no-{help,quiet,debug,branch,message} | |
a591f232 | 524 | |
cdae5367 JH |
525 | "git cmd -h" learned to signal which options can be negated by |
526 | listing such options like "--[no-]opt". | |
a591f232 | 527 | |
21dd98b2 JH |
528 | Comments? |
529 | source: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de> | |
cdae5367 JH |
530 | |
531 | ||
c486f9e6 | 532 | * mh/credential-erase-improvements-more (2023-07-26) 2 commits |
21dd98b2 JH |
533 | (merged to 'next' on 2023-08-08 at fd1ba4accf) |
534 | + credential/wincred: erase matching creds only | |
535 | + credential/libsecret: erase matching creds only | |
8cf8b60e | 536 | |
c486f9e6 JH |
537 | Update two credential helpers to correctly match which credential |
538 | to erase; they dropped not the ones with stale password. | |
539 | ||
21dd98b2 | 540 | Will cook in 'next'. |
4caa171c | 541 | Needs review. |
c486f9e6 | 542 | source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com> |
4caa171c JH |
543 | source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com> |
544 | ||
545 | ||
7ff8a6d0 JH |
546 | * cc/repack-sift-filtered-objects-to-separate-pack (2023-08-09) 9 commits |
547 | - SQUASH??? | |
548 | - gc: add `gc.repackFilterTo` config option | |
549 | - repack: implement `--filter-to` for storing filtered out objects | |
550 | - gc: add `gc.repackFilter` config option | |
551 | - repack: add `--filter=<filter-spec>` option | |
552 | - repack: refactor finding pack prefix | |
553 | - repack: refactor finishing pack-objects command | |
554 | - t/helper: add 'find-pack' test-tool | |
555 | - pack-objects: allow `--filter` without `--stdout` | |
c54a1591 | 556 | |
bb016b89 JH |
557 | "git repack" machinery learns to pay attention to the "--filter=" |
558 | option. | |
c54a1591 | 559 | |
7ff8a6d0 | 560 | cf. https://github.com/git/git/actions/runs/5812873987 |
21dd98b2 | 561 | source: <20230808082608.582319-1-christian.couder@gmail.com> |
cf824b16 JH |
562 | |
563 | ||
21dd98b2 JH |
564 | * js/doc-unit-tests (2023-08-07) 1 commit |
565 | - unit tests: add a project plan document | |
bb016b89 JH |
566 | |
567 | Process to add some form of low-level unit tests has started. | |
568 | ||
21dd98b2 JH |
569 | Comments? |
570 | source: <c7dca1a805a16fd4fd68e86efeec97510e3ac4b8.1691449216.git.steadmon@google.com> | |
cf824b16 JH |
571 | |
572 | ||
21dd98b2 | 573 | * jt/path-filter-fix (2023-08-08) 8 commits |
7ff8a6d0 JH |
574 | (merged to 'next' on 2023-08-09 at 59952b9ec9) |
575 | + commit-graph: fix small leak with invalid changedPathsVersion | |
0e87def2 JH |
576 | (merged to 'next' on 2023-08-03 at d99958c287) |
577 | + commit-graph: new filter ver. that fixes murmur3 | |
578 | + repo-settings: introduce commitgraph.changedPathsVersion | |
579 | + t4216: test changed path filters with high bit paths | |
580 | + t/helper/test-read-graph: implement `bloom-filters` mode | |
581 | + bloom.h: make `load_bloom_filter_from_graph()` public | |
582 | + t/helper/test-read-graph.c: extract `dump_graph_info()` | |
583 | + gitformat-commit-graph: describe version 2 of BDAT | |
c70fb5fb JH |
584 | |
585 | The Bloom filter used for path limited history traversal was broken | |
586 | on systems whose "char" is unsigned; update the implementation and | |
587 | bump the format version to 2. | |
cdae5367 | 588 | |
21dd98b2 | 589 | Will cook in 'next'. |
0e87def2 | 590 | cf. <ZMqp6K2iXixWH/zT@nand.local> |
1bbcd54e | 591 | source: <cover.1690912539.git.jonathantanmy@google.com> |
21dd98b2 | 592 | source: <20230808192240.GA4091261@coredump.intra.peff.net> |
7ff8a6d0 JH |
593 | |
594 | ||
595 | * ob/test-lib-rebase-fake-editor-updates (2023-08-10) 3 commits | |
596 | - t/lib-rebase: improve documentation of set_fake_editor() | |
597 | - t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently | |
598 | - t/lib-rebase: set_fake_editor(): fix recognition of reset's short command | |
599 | ||
600 | Test updates. | |
601 | ||
602 | Will merge to 'next'. | |
603 | source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de> | |
604 | source: <20230809171531.2564785-1-oswald.buddenhagen@gmx.de> |