5e32df48a5 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2022, #05; Wed, 14)

2 +Subject: What's cooking in git.git (Dec 2022, #06; Sun, 18)

3 X-master-at: 57e2c6ebbe7108b35ba30184dcbcb6c34c929ad8

4 -X-next-at: 57e2c6ebbe7108b35ba30184dcbcb6c34c929ad8

4 +X-next-at: 31fb33b8321cb7af67cb16c2d66b91c3989345b3

5 Bcc: lwn@lwn.net, gitster@pobox.com

6

7 -What's cooking in git.git (Dec 2022, #05; Wed, 14)

7 +What's cooking in git.git (Dec 2022, #06; Sun, 18)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking in my tree. Commits

@@ -14,19 +14,11 @@ 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 -The first batch of topics have graduated from 'next' to 'master'.

18 -

19 -In the past, I tried to re-examine all the topics in 'next' myself

20 -to pick and choose the ones to be kept before rewinding and

21 -rebuilding 'next' after each release, which took me a while. This

22 -time, to share the burden to expedite the process, I'll reset 'next'

23 -to 'master' without any topics merged, and rely on input from list

24 -participants.

25 -

26 -The topics that used to be in 'next' are all marked as "Will merge

27 -back to 'next'", but people can tell me to give them a chance to

28 -reboot their topics, instead of piling "oops, that was wrong" fixes

29 -on top, while I wait for such an input for the coming days.

17 +Looking at the list of topics slated for 'master' in this issue of

18 +the report, we will probably have a big update to 'master' before

19 +the Chrismas. But other than that, I expect things will be slow

20 +towards the end of the year. Be good boys and girls, and enjoy

21 +yourselves, everybody.

22

23 Copies of the source code to Git live in many repositories, and the

24 following is a list of the ones I push into or their mirrors. Some

@@ -176,6 +168,127 @@ Release tarballs are available at:

168 --------------------------------------------------

169 [New Topics]

170

171 +* ab/darwin-default-to-sha1dc (2022-12-16) 1 commit

172 + (merged to 'next' on 2022-12-16 at 31fb33b832)

173 + + Makefile: use sha1collisiondetection by default on OSX and Darwin

174 +

175 + Use the SHA1DC implementation on macOS, just like other platforms,

176 + by default.

177 +

178 + Will merge to 'master'.

179 + source: <patch-v2-1.1-3de7cdbd260-20221215T084129Z-avarab@gmail.com>

180 +

181 +

182 +* ab/no-more-git-global-super-prefix (2022-12-16) 9 commits

183 + - read-tree: add "--super-prefix" option, eliminate global

184 + - submodule--helper: convert "{update,clone}" to their own "--super-prefix"

185 + - submodule--helper: convert "status" to its own "--super-prefix"

186 + - submodule--helper: convert "sync" to its own "--super-prefix"

187 + - submodule--helper: convert "foreach" to its own "--super-prefix"

188 + - submodule--helper: don't use global --super-prefix in "absorbgitdirs"

189 + - submodule.c & submodule--helper: pass along "super_prefix" param

190 + - read-tree + fetch tests: test failing "--super-prefix" interaction

191 + - submodule absorbgitdirs tests: add missing "Migrating git..." tests

192 +

193 + Stop using "git --super-prefix" and narrow the scope of its use to

194 + the submodule--helper.

195 +

196 + Expecting the final reroll.

197 + cf. <kl6lzgbocqki.fsf@chooglen-macbookpro.roam.corp.google.com>

198 + source: <cover-v4-0.9-00000000000-20221215T083502Z-avarab@gmail.com>

199 +

200 +

201 +* jk/ref-filter-error-reporting-fix (2022-12-15) 5 commits

202 + (merged to 'next' on 2022-12-16 at 8135d51462)

203 + + ref-filter: convert email atom parser to use err_bad_arg()

204 + + ref-filter: truncate atom names in error messages

205 + + ref-filter: factor out "unrecognized %(foo) arg" errors

206 + + ref-filter: factor out "%(foo) does not take arguments" errors

207 + + ref-filter: reject arguments to %(HEAD)

208 +

209 + Clean-ups in error messages produced by "git for-each-ref" and friends.

210 +

211 + Will merge to 'master'.

212 + source: <Y5n3S7cnD7s/AIRL@coredump.intra.peff.net>

213 +

214 +

215 +* pg/diff-stat-unmerged-regression-fix (2022-12-15) 1 commit

216 + (merged to 'next' on 2022-12-16 at 2a61376847)

217 + + diff: fix regression with --stat and unmerged file

218 +

219 + The output from "git diff --stat" on an unmerged path lost the

220 + terminating LF in Git 2.39, which has been corrected.

221 +

222 + Will merge to 'master'.

223 + source: <20221214174150.404821-1-pete@jpgrayson.net>

224 +

225 +

226 +* sk/remove-duplicate-includes (2022-12-15) 1 commit

227 + (merged to 'next' on 2022-12-16 at 846bc84e59)

228 + + git: remove duplicate includes

229 +

230 + Code clean-up.

231 +

232 + Will merge to 'master'.

233 + source: <pull.1394.git.git.1671036743272.gitgitgadget@gmail.com>

234 +

235 +

236 +* cb/grep-fallback-failing-jit (2022-12-17) 1 commit

237 + - grep: fall back to interpreter mode if JIT fails

238 +

239 + In an environment where dynamically generated code is prohibited to

240 + run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall

241 + back to interpreted execution in such a case.

242 +

243 + Expecting a reroll.

244 + cf. <62a06c5b-9646-17f8-b4d5-39823d3cc25a@grsecurity.net>

245 + source: <20221216121557.30714-1-minipli@grsecurity.net>

246 +

247 +

248 +* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit

249 + - e-mail workflow: Message-ID is spelled with ID in both capital letters

250 +

251 + Consistently spell "Message-ID" as such, not "Message-Id".

252 +

253 + Comments?

254 + source: <xmqqsfhgnmqg.fsf@gitster.g>

255 +

256 +

257 +* lk/line-range-parsing-fix (2022-12-18) 1 commit

258 + - line-range: fix infinite loop bug with degenerate '$' regex

259 +

260 + When given a pattern that matches an empty string at the end of a

261 + line, the code to parse the "git diff" line-ranges fell into an

262 + infinite loop, which has been corrected.

263 +

264 + Will merge to 'next'.

265 + source: <20221211015340.2181837-1-lars@oddbit.com>

266 +

267 +

268 +* sa/git-var-sequence-editor (2022-12-18) 1 commit

269 + - var: add GIT_SEQUENCE_EDITOR variable

270 +

271 + Just like "git var GIT_EDITOR" abstracts the complex logic to

272 + choose which editor gets used behind it, "git var" now give support

273 + to GIT_SEQUENCE_EDITOR.

274 +

275 + Will merge to 'next'.

276 + source: <pull.1424.v2.git.1671318599482.gitgitgadget@gmail.com>

277 +

278 +

279 +* ss/pull-v-recurse-fix (2022-12-18) 1 commit

280 + - submodule: accept -v for the update command

281 +

282 + "git pull -v --recurse-submodules" attempted to pass "-v" down to

283 + underlying "git submodule update", which did not understand the

284 + request and barfed, which has been corrected.

285 +

286 + Will merge to 'next'.

287 + source: <f805f2da-a7e1-9fde-cc0a-04a30f79c9af@cs-ware.de>

288 +

289 +--------------------------------------------------

290 +[Cooking]

291 +

292 * ds/bundle-uri-4-fixup (2022-12-13) 3 commits

293 - bundle-uri: remove GIT_TEST_BUNDLE_URI env variable

294 - bundle-uri: advertise based on repo config

@@ -188,7 +301,7 @@ Release tarballs are available at:

301 source: <pull.1443.git.1670866407.gitgitgadget@gmail.com>

302

303

191 -* ds/omit-trailing-hash-in-index (2022-12-13) 4 commits

304 +* ds/omit-trailing-hash-in-index (2022-12-17) 4 commits

305 - features: feature.manyFiles implies fast index writes

306 - test-lib-functions: add helper for trailing hash

307 - read-cache: add index.skipHash config option

@@ -197,130 +310,100 @@ Release tarballs are available at:

310 Introduce an optional configuration to allow the trailing hash that

311 protects the index file from bit flipping.

312

200 - Will merge to 'next'.

201 - source: <pull.1439.v2.git.1670862677.gitgitgadget@gmail.com>

313 + Will merge to 'next'?

314 + source: <pull.1439.v4.git.1671204678.gitgitgadget@gmail.com>

315

316

317 * jk/server-supports-v2-cleanup (2022-12-13) 1 commit

205 - - server_supports_v2(): use a separate function for die_on_error

318 + (merged to 'next' on 2022-12-16 at 9b995dc263)

319 + + server_supports_v2(): use a separate function for die_on_error

320

321 Code clean-up.

322

209 - Will merge to 'next'.

323 + Will merge to 'master'.

324 source: <Y5hZirNRGLQUZfOZ@coredump.intra.peff.net>

325

326

327 * jk/unused-post-2.39 (2022-12-13) 9 commits

214 - - userdiff: mark unused parameter in internal callback

215 - - list-objects-filter: mark unused parameters in virtual functions

216 - - diff: mark unused parameters in callbacks

217 - - xdiff: mark unused parameter in xdl_call_hunk_func()

218 - - xdiff: drop unused parameter in def_ff()

219 - - ws: drop unused parameter from ws_blank_line()

220 - - list-objects: drop process_gitlink() function

221 - - blob: drop unused parts of parse_blob_buffer()

222 - - ls-refs: use repository parameter to iterate refs

328 + (merged to 'next' on 2022-12-16 at 4ce4a868e5)

329 + + userdiff: mark unused parameter in internal callback

330 + + list-objects-filter: mark unused parameters in virtual functions

331 + + diff: mark unused parameters in callbacks

332 + + xdiff: mark unused parameter in xdl_call_hunk_func()

333 + + xdiff: drop unused parameter in def_ff()

334 + + ws: drop unused parameter from ws_blank_line()

335 + + list-objects: drop process_gitlink() function

336 + + blob: drop unused parts of parse_blob_buffer()

337 + + ls-refs: use repository parameter to iterate refs

338

339 Code clean-up around unused function parameters.

340

226 - Will merge to 'next'.

341 + Will merge to 'master'.

342 source: <Y5hdvpbLpXySHFRz@coredump.intra.peff.net>

343

344

345 * jt/http-fetch-trace2-report-name (2022-12-13) 1 commit

231 - - http-fetch: invoke trace2_cmd_name()

346 + (merged to 'next' on 2022-12-16 at b26e38cdb2)

347 + + http-fetch: invoke trace2_cmd_name()

348

349 "git http-fetch" (which is rarely used) forgot to identify itself

350 in the trace2 output.

351

236 - Will merge to 'next'.

352 + Will merge to 'master'.

353 source: <20221212224630.2553391-1-jonathantanmy@google.com>

354

355

356 * rs/am-parse-options-cleanup (2022-12-13) 1 commit

241 - - am: don't pass strvec to apply_parse_options()

357 + (merged to 'next' on 2022-12-16 at 9013ff2a19)

358 + + am: don't pass strvec to apply_parse_options()

359

243 - Will merge to 'next'.

360 Code clean-up.

361 +

362 + Will merge to 'master'.

363 source: <baf93e4a-7f05-857c-e551-09675496c03c@web.de>

364

365

366 * rs/clarify-error-in-write-loose-object (2022-12-14) 1 commit

249 - - object-file: inline write_buffer()

367 + (merged to 'next' on 2022-12-16 at 8ef4588405)

368 + + object-file: inline write_buffer()

369

370 Code clean-up.

371

253 - Will merge to 'next'.

372 + Will merge to 'master'.

373 source: <94dff140-489c-40b2-7212-201ed3b7d008@web.de>

374

375

376 * rs/clear-commit-marks-cleanup (2022-12-13) 1 commit

258 - - commit: skip already cleared parents in clear_commit_marks_1()

377 + (merged to 'next' on 2022-12-16 at a9e52a7cef)

378 + + commit: skip already cleared parents in clear_commit_marks_1()

379

380 Code clean-up.

381

262 - Will merge to 'next'.

382 + Will merge to 'master'.

383 source: <7cf2ea1f-8dbf-5639-3874-86de391ae20a@web.de>

384

385

386 * rs/reflog-expiry-cleanup (2022-12-13) 1 commit

267 - - reflog: clear leftovers in reflog_expiry_cleanup()

387 + (merged to 'next' on 2022-12-16 at 8165a625dd)

388 + + reflog: clear leftovers in reflog_expiry_cleanup()

389

390 Code clean-up.

391

271 - Will merge to 'next'.

392 + Will merge to 'master'.

393 source: <a53d4df3-4b2c-585a-e8ad-2a9b9017fb8c@web.de>

394

395

396 * sg/help-autocorrect-config-fix (2022-12-13) 1 commit

276 - - help.c: fix autocorrect in work tree for bare repository

397 + (merged to 'next' on 2022-12-16 at edcf99f34c)

398 + + help.c: fix autocorrect in work tree for bare repository

399

400 The code to auto-correct a misspelt subcommand unnecessarily called

401 into git_default_config() from the early config codepath, which was

402 a no-no. This has bee corrected.

403

282 - Will merge to 'next'.

404 + Will merge to 'master'.

405 source: <pull.1373.v2.git.git.1667073374852.gitgitgadget@gmail.com>

406

285 ---------------------------------------------------

286 -[Stalled]

287 -

288 -* pw/test-todo (2022-10-06) 3 commits

289 - . test_todo: allow [verbose] test as the command

290 - . test_todo: allow [!] grep as the command

291 - . tests: add test_todo() to mark known breakages

292 -

293 - RFC for test framework improvement.

294 -

295 - Needs review.

296 - source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>

297 -

298 -

299 -* cw/submodule-status-in-parallel (2022-11-08) 6 commits

300 - - diff-lib: parallelize run_diff_files for submodules

301 - - diff-lib: refactor match_stat_with_submodule

302 - - submodule: move status parsing into function

303 - - submodule: strbuf variable rename

304 - - run-command: add duplicate_output_fn to run_processes_parallel_opts

305 - - Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel

306 -

307 - Allow the internal "diff-files" engine to run "how has this

308 - submodule changed?" in parallel to speed up "git status".

309 -

310 - Waiting for review.

311 - source: <20221020232532.1128326-1-calvinwan@google.com>

312 -

313 -

314 -* es/doc-creation-factor-fix (2022-07-28) 2 commits

315 - . range-diff: clarify --creation-factor=<factor>

316 - . format-patch: clarify --creation-factor=<factor>

317 -

318 - Expecting a reroll by somebody more familiar with the logic

319 - cf. <xmqqo7wfix7p.fsf@gitster.g>

320 - source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>

321 -

322 ---------------------------------------------------

323 -[Cooking]

407

408 * ed/fsmonitor-inotify (2022-12-13) 6 commits

409 - fsmonitor: update doc for Linux

@@ -337,12 +420,13 @@ Release tarballs are available at:

420

421

422 * rs/t3920-crlf-eating-grep-fix (2022-12-07) 1 commit

340 - - t3920: support CR-eating grep

423 + (merged to 'next' on 2022-12-16 at 56ff27beaa)

424 + + t3920: support CR-eating grep

425 (this branch uses js/t3920-shell-and-or-fix.)

426

427 Test fix.

428

345 - Will merge back to 'next'.

429 + Will merge to 'master'.

430 source: <cbe88abc-c1fb-cb50-6057-47ff27f7a12d@web.de>

431

432

@@ -355,114 +439,124 @@ Release tarballs are available at:

439

440

441 * ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit

358 - - t4023: fix ignored exit codes of git

442 + (merged to 'next' on 2022-12-16 at 75c7a06930)

443 + + t4023: fix ignored exit codes of git

444

445 Test fix.

446

362 - Will merge back to 'next'.

447 + Will merge to 'master'.

448 source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>

449

450

451 * jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit

367 - - fsmonitor: fix race seen in t7527

452 + (merged to 'next' on 2022-12-16 at d64198c6c3)

453 + + fsmonitor: fix race seen in t7527

454

455 Make fsmonitor more robust to avoid the flakiness seen in t7527.

456

371 - Will merge back to 'next'.

457 + Will merge to 'master'.

458 source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>

459

460

461 * rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit

376 - - list-objects-filter: plug pattern_list leak

462 + (merged to 'next' on 2022-12-16 at 5cc6d4165a)

463 + + list-objects-filter: plug pattern_list leak

464

465 Leak fix.

466

380 - Will merge back to 'next'.

467 + Will merge to 'master'.

468 source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>

469

470

471 * rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit

385 - - t4205: don't exit test script on failure

472 + (merged to 'next' on 2022-12-16 at 71b4de7729)

473 + + t4205: don't exit test script on failure

474

475 Test fix.

476

389 - Will merge back to 'next'.

477 + Will merge to 'master'.

478 source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>

479

480

481 * ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit

394 - - t5314: check exit code of "git"

482 + (merged to 'next' on 2022-12-16 at 40f3acd249)

483 + + t5314: check exit code of "git"

484

485 Test fix.

486

398 - Will merge back to 'next'.

487 + Will merge to 'master'.

488 source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>

489

490

491 * ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit

403 - - t7600: don't ignore "rev-parse" exit code in helper

492 + (merged to 'next' on 2022-12-16 at ef89e4f2d1)

493 + + t7600: don't ignore "rev-parse" exit code in helper

494

495 Test fix.

496

407 - Will merge back to 'next'.

497 + Will merge to 'master'.

498 source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>

499

500

411 -* jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit

412 - - fsmonitor: eliminate call to deprecated FSEventStream function

501 +* jh/fsmonitor-darwin-modernize (2022-12-15) 1 commit

502 + (merged to 'next' on 2022-12-16 at 197e1f8c43)

503 + + fsmonitor: eliminate call to deprecated FSEventStream function

504

505 Stop using deprecated macOS API in fsmonitor.

506

416 - Will merge back to 'next'.

417 - source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>

507 + Will merge to 'master'.

508 + source: <pull.1436.v2.git.1671045153981.gitgitgadget@gmail.com>

509

510

511 * js/t3920-shell-and-or-fix (2022-12-05) 1 commit

421 - - t3920: don't ignore errors of more than one command with `|| true`

512 + (merged to 'next' on 2022-12-16 at 59536ed758)

513 + + t3920: don't ignore errors of more than one command with `|| true`

514 (this branch is used by rs/t3920-crlf-eating-grep-fix.)

515

516 Test fix.

517

426 - Will merge back to 'next'.

518 + Will merge to 'master'.

519 source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>

520

521

522 * sx/pthread-error-check-fix (2022-12-05) 1 commit

431 - - maintenance: compare output of pthread functions for inequality with 0

523 + (merged to 'next' on 2022-12-16 at 60848153fe)

524 + + maintenance: compare output of pthread functions for inequality with 0

525

526 Correct pthread API usage.

527

435 - Will merge back to 'next'.

528 + Will merge to 'master'.

529 source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>

530

531

532 * jk/avoid-redef-system-functions (2022-12-05) 3 commits

440 - - Merge branch 'jk/avoid-redef-system-functions-2.30' into jk/avoid-redef-system-functions

441 - - Merge branch 'jk/avoid-redef-system-functions-2.30'

442 - - Merge branch 'jk/avoid-redef-system-functions-2.30' into maint

533 + (merged to 'next' on 2022-12-16 at 55f7102dba)

534 + + Merge branch 'jk/avoid-redef-system-functions-2.30' into jk/avoid-redef-system-functions

535 + + Merge branch 'jk/avoid-redef-system-functions-2.30'

536 + + Merge branch 'jk/avoid-redef-system-functions-2.30' into maint

537 (this branch uses jk/avoid-redef-system-functions-2.30.)

538

539 The jk/avoid-redef-system-functions-2.30 topic pre-merged for more

540 recent codebase.

541

448 - Will merge back to 'next'.

542 + Will merge to 'master'.

543

544

545 * jk/avoid-redef-system-functions-2.30 (2022-12-05) 2 commits

452 - - git-compat-util: undefine system names before redeclaring them

453 - - git-compat-util: avoid redefining system function names

546 + (merged to 'next' on 2022-12-16 at aa101dfc0c)

547 + + git-compat-util: undefine system names before redeclaring them

548 + + git-compat-util: avoid redefining system function names

549 (this branch is used by jk/avoid-redef-system-functions.)

550

551 Redefining system functions for a few functions did not follow our

552 usual "implement git_foo() and #define foo(args) git_foo(args)"

553 pattern, which has broken build for some folks.

554

460 - Will merge back to 'next'.

555 + Will merge to 'master'.

556 source: <Y4fH4rhcSztHwKvK@coredump.intra.peff.net>

462 - source: <Y4RAr04vS/TOM5uh@coredump.intra.peff.net>

557

558

465 -* jt/avoid-lazy-fetch-commits (2022-12-13) 4 commits

559 +* jt/avoid-lazy-fetch-commits (2022-12-15) 4 commits

560 - commit: don't lazy-fetch commits

561 - object-file: emit corruption errors when detected

562 - object-file: refactor map_loose_object_1()

@@ -474,18 +568,19 @@ Release tarballs are available at:

568 advantage of this assumption to fail fast on errors.

569

570 Will merge to 'next'?

477 - source: <cover.1670885252.git.jonathantanmy@google.com>

571 + source: <cover.1671045259.git.jonathantanmy@google.com>

572

573

574 * rs/diff-parseopts (2022-12-02) 3 commits

481 - - diff: remove parseopts member from struct diff_options

482 - - diff: use add_diff_options() in diff_opt_parse()

483 - - diff: factor out add_diff_options()

575 + (merged to 'next' on 2022-12-16 at 6fdfd67cb9)

576 + + diff: remove parseopts member from struct diff_options

577 + + diff: use add_diff_options() in diff_opt_parse()

578 + + diff: factor out add_diff_options()

579

580 The way the diff machinery prepares the options array for the

581 parse_options API has been refactored to avoid resource leaks.

582

488 - Will merge back to 'next'.

583 + Will merge to 'master'.

584 source: <19325420-5630-87bb-0c2c-362151214b36@web.de>

585

586

@@ -510,20 +605,15 @@ Release tarballs are available at:

605 source: <87edtp5uws.fsf@kyleam.com>

606

607

513 -* so/diff-merges-more (2022-11-30) 6 commits

514 - - SQUASH??? cocci fix

608 +* so/diff-merges-more (2022-12-18) 5 commits

609 + - diff-merges: improve --diff-merges documentation

610 - diff-merges: issue warning on lone '-m' option

611 - diff-merges: support list of values for --diff-merges

517 - - diff-merges: implement log.diffMergesForce config

612 - diff-merges: implement log.diffMerges-m-imply-p config

613 - diff-merges: implement [no-]hide option and log.diffMergesHide config

614

615 Assorted updates to "--diff-merges=X" option.

522 -

523 - Seems to break CI.

524 - Cocci complains about "if (func_ptr != NULL)"

525 - cf. https://github.com/git/git/actions/runs/3583592108/jobs/6029213624

526 - source: <20221127093721.31012-1-sorganov@gmail.com>

616 + source: <20221217132955.108542-1-sorganov@gmail.com>

617

618

619 * ab/config-multi-and-nonbool (2022-11-27) 9 commits

@@ -577,11 +667,12 @@ Release tarballs are available at:

667

668

669 * rj/branch-copy-and-rename (2022-11-17) 1 commit

580 - - branch: force-copy a branch to itself via @{-1} is a no-op

670 + (merged to 'next' on 2022-12-16 at b88fa41a8a)

671 + + branch: force-copy a branch to itself via @{-1} is a no-op

672

673 Fix a pair of bugs in 'git branch'.

674

584 - Will merge back to 'next'.

675 + Will merge to 'master'.

676 source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>

677

678

@@ -624,12 +715,13 @@ Release tarballs are available at:

715

716

717 * aw/complete-case-insensitive (2022-11-30) 2 commits

627 - - completion: add case-insensitive match of pseudorefs

628 - - completion: add optional ignore-case when matching refs

718 + (merged to 'next' on 2022-12-16 at 341974c2bb)

719 + + completion: add case-insensitive match of pseudorefs

720 + + completion: add optional ignore-case when matching refs

721

722 Introduce a case insensitive mode to the Bash completion helpers.

723

632 - Will merge back to 'next'.

724 + Will merge to 'master'.

725 source: <pull.1374.v2.git.git.1668990419.gitgitgadget@gmail.com>

726

727

@@ -684,7 +776,7 @@ Release tarballs are available at:

776

777 Bundle URIs part 4.

778

687 - Will merge back to 'next'?

779 + Will merge to 'next'?

780 source: <pull.1400.v3.git.1670262639.gitgitgadget@gmail.com>

781

782

@@ -698,12 +790,13 @@ Release tarballs are available at:

790

791

792 * rr/status-untracked-advice (2022-12-01) 1 commit

701 - - status: modernize git-status "slow untracked files" advice

793 + (merged to 'next' on 2022-12-16 at bed7d84d07)

794 + + status: modernize git-status "slow untracked files" advice

795

796 The advice message given by "git status" when it takes long time to

797 enumerate untracked paths has been updated.

798

706 - Will merge back to 'next'.

799 + Will merge to 'master'.

800 source: <pull.1384.v9.git.1669769536707.gitgitgadget@gmail.com>

801

802

@@ -732,240 +825,43 @@ Release tarballs are available at:

825

826 Extending credential helper protocol.

827

735 - Needs review.

828 + Waiting for review responses (or a reroll).

829 + cf. <1dc44716-2550-47de-e666-9972b102905d@github.com>

830 source: <pull.1352.v4.git.1670880984.gitgitgadget@gmail.com>

831

832 --------------------------------------------------

833 [Discarded]

834

741 -* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits

742 - . clone, submodule update: create and check out branches

743 - . submodule--helper: remove update_data.suboid

744 - . submodule update: refactor update targets

745 - . submodule: return target of submodule symref

746 - . t5617: drop references to remote-tracking branches

747 - . submodule--helper clone: create named branch

748 - . repo-settings: add submodule_propagate_branches

749 - . clone: teach --detach option

750 -

751 - "git clone --recurse-submodules" and "git submodule update" learns

752 - to honor the "propagete branches" option.

753 -

754 - Retracted.

755 - cf. <xmqqedtl14xr.fsf@gitster.g>

756 - source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>

757 -

758 -

759 -* ab/remove--super-prefix (2022-11-21) 12 commits

760 - . fetch: rename "--submodule-prefix" to "--super-prefix"

761 - . read-tree: add "--super-prefix" option, eliminate global

762 - . submodule--helper: convert "{update,clone}" to their own "--super-prefix"

763 - . submodule--helper: convert "status" to its own "--super-prefix"

764 - . submodule--helper: convert "sync" to its own "--super-prefix"

765 - . submodule--helper: convert "foreach" to its own "--super-prefix"

766 - . submodule--helper: don't use global --super-prefix in "absorbgitdirs"

767 - . submodule.c & submodule--helper: pass along "super_prefix" param

768 - . read-tree + fetch tests: test failing "--super-prefix" interaction

769 - . Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix

770 - . submodule--helper absorbgitdirs: no abspaths in "Migrating git..."

771 - . Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix

772 -

773 - Remove the top-level `--super-prefix` option.

774 - Will discard.

775 - cf. the thread leading to <xmqqmt86stm3.fsf@gitster.g>

776 - source: <cover-v3-0.9-00000000000-20221119T122853Z-avarab@gmail.com>

777 -

778 -

779 -* ab/submodule-no-abspath (2022-11-23) 2 commits

780 - . submodule absorbgitdirs: use relative <from> and <to> paths

781 - . submodule--helper absorbgitdirs: no abspaths in "Migrating git..."

782 -

783 - Remove an absolute path in the "Migrating git directory" message.

784 -

785 - Revert out of 'next'.

786 - cf. the thread leading to <xmqqmt86stm3.fsf@gitster.g>

787 - source: <patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com>

788 -

789 -

790 -* ab/cmake-nix-and-ci (2022-11-04) 14 commits

791 - . CI: add a "linux-cmake-test" to run cmake & ctest on linux

792 - . cmake: copy over git-p4.py for t983[56] perforce test

793 - . cmake: only look for "sh" in "C:/Program Files" on Windows

794 - . cmake: increase test timeout on Windows only

795 - . cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults

796 - . Makefile + cmake: use environment, not GIT-BUILD-DIR

797 - . test-lib.sh: support a "GIT_TEST_BUILD_DIR"

798 - . cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh

799 - . cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable

800 - . cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4

801 - . cmake: don't copy chainlint.pl to build directory

802 - . cmake: update instructions for portable CMakeLists.txt

803 - . cmake: use "-S" and "-B" to specify source and build directories

804 - . cmake: don't invoke msgfmt with --statistics

805 -

806 - Fix assorted issues with CTest on *nix machines.

807 -

808 - Revert out of 'next'.

809 - cf. <xmqq5yeuspam.fsf@gitster.g>

810 - source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>

811 -

812 -

813 -* ms/sendemail-validate-headers (2022-11-11) 1 commit

814 - . Expose header information to git-send-email's sendemail-validate hook

835 +* pw/test-todo (2022-10-06) 3 commits

836 + . test_todo: allow [verbose] test as the command

837 + . test_todo: allow [!] grep as the command

838 + . tests: add test_todo() to mark known breakages

839

816 - Expecting a reroll.

817 - Appears to break t9001 completely?

818 - source: <20221111194223.644845-2-michael.strawbridge@amd.com>

840 + RFC for test framework improvement.

841 +

842 + Needs review.

843 + source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>

844

845

821 -* hl/archive-recursive (2022-10-19) 10 commits

822 - . fixup! archive: add tests for git archive --recurse-submodules

823 - . archive: add tests for git archive --recurse-submodules

824 - . archive: add --recurse-submodules to git-archive command

825 - . archive: remove global repository from archive_args

826 - . archive: pass repo objects to write_archive handlers

827 - . tree: add repository parameter to read_tree_fn_t

828 - . tree: handle submodule case for read_tree_at properly

829 - . tree: increase test coverage for tree.c

830 - . tree: update cases to use repo_ tree methods

831 - . tree: do not use the_repository for tree traversal methods.

846 +* cw/submodule-status-in-parallel (2022-11-08) 6 commits

847 + . diff-lib: parallelize run_diff_files for submodules

848 + . diff-lib: refactor match_stat_with_submodule

849 + . submodule: move status parsing into function

850 + . submodule: strbuf variable rename

851 + . run-command: add duplicate_output_fn to run_processes_parallel_opts

852 + . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel

853

833 - "git archive" has been taught "--recurse-submodules" option to

834 - create a tarball that includes contents from submodules.

854 + Allow the internal "diff-files" engine to run "how has this

855 + submodule changed?" in parallel to speed up "git status".

856

836 - Expecting a reroll.

837 - Seems to break win+VS test(8).

838 - cf. https://github.com/git/git/actions/runs/3293333066 whose only

839 - difference from https://github.com/git/git/actions/runs/3293553109

840 - is the inclusion of this topic.

841 - source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>

842 -

843 -

844 -* js/bisect-in-c (2022-08-30) 17 commits

845 - . bisect: no longer try to clean up left-over `.git/head-name` files

846 - . bisect: remove Cogito-related code

847 - . Turn `git bisect` into a full built-in

848 - . bisect: move even the command-line parsing to `bisect--helper`

849 - . bisect--helper: make `state` optional

850 - . bisect--helper: calling `bisect_state()` without an argument is a bug

851 - . bisect: avoid double-quoting when printing the failed command

852 - . bisect run: fix the error message

853 - . bisect: verify that a bogus option won't try to start a bisection

854 - . bisect--helper: migrate to OPT_SUBCOMMAND()

855 - . bisect--helper: make the order consistently `argc, argv`

856 - . bisect--helper: make `terms` an explicit singleton

857 - . bisect--helper: simplify exit code computation

858 - . bisect--helper: really retire `--bisect-autostart`

859 - . bisect--helper: really retire --bisect-next-check

860 - . bisect--helper: retire the --no-log option

861 - . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c

862 -

863 - Final bits of "git bisect.sh" have been rewritten in C.

864 -

865 - Tired of waiting for too long.

866 - source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>

867 -

868 -

869 -* ag/merge-strategies-in-c (2022-08-10) 14 commits

870 - . sequencer: use the "octopus" strategy without forking

871 - . sequencer: use the "resolve" strategy without forking

872 - . merge: use the "octopus" strategy without forking

873 - . merge: use the "resolve" strategy without forking

874 - . merge-octopus: rewrite in C

875 - . merge-recursive: move better_branch_name() to merge.c

876 - . merge-resolve: rewrite in C

877 - . merge-one-file: rewrite in C

878 - . update-index: move add_cacheinfo() to read-cache.c

879 - . merge-index: add a new way to invoke `git-merge-one-file'

880 - . merge-index: drop the index

881 - . merge-index: libify merge_one_path() and merge_all()

882 - . t6060: add tests for removed files

883 - . t6060: modify multiple files to expose a possible issue with merge-index

884 -

885 - An attempt to rewrite remaining merge strategies from shell to C.

886 -

887 - Tired of waiting for too long.

888 - source: <20220809185429.20098-1-alban.gruin@gmail.com>

889 -

890 -

891 -* cw/remote-object-info (2022-08-13) 7 commits

892 - . SQUASH???

893 - . cat-file: add remote-object-info to batch-command

894 - . transport: add client support for object-info

895 - . serve: advertise object-info feature

896 - . protocol-caps: initialization bug fix

897 - . fetch-pack: move fetch initialization

898 - . fetch-pack: refactor packet writing

899 -

900 - A client component to talk with the object-info endpoint.

901 -

902 - Tired of waiting for too long.

903 - Under SANITIZE=address, t1006-cat-file.sh finds a breakage.

904 - cf. <20220728230210.2952731-1-calvinwan@google.com>

905 - cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>

906 - source: <20220728230210.2952731-1-calvinwan@google.com>

907 -

908 -

909 -* tl/ls-tree--pattern (2022-11-17) 6 commits

910 - . ls-tree: introduce '--pattern' option

911 - . ls-tree: introduce 'match_pattern()' function

912 - . ls-tree: improving cohension in the print code

913 - . ls-tree: optimize params of 'show_tree_common_default_long()'

914 - . t3104: remove shift code in 'test_ls_tree_format'

915 - . ls-tree: cleanup the redundant SPACE

916 -

917 - A synonym for "ls-tree | grep <pattern>", "ls-tree

918 - --pattern=<pattern>" was introduced.

919 -

920 - No upsides.

921 - cf. <xmqqbko6y2q5.fsf@gitster.g>

922 - source: <20221117113023.65865-1-tenglong.tl@alibaba-inc.com>

923 -

924 -

925 -* ds/packed-refs-v2 (2022-11-07) 30 commits

926 - . refs: skip hashing when writing packed-refs v2

927 - . p1401: create performance test for ref operations

928 - . ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds

929 - . t*: skip packed-refs v2 over http tests

930 - . t3210: require packed-refs v1 for some tests

931 - . t5502: add PACKED_REFS_V1 prerequisite

932 - . t5312: allow packed-refs v2 format

933 - . t1409: test with packed-refs v2

934 - . packed-backend: create GIT_TEST_PACKED_REFS_VERSION

935 - . packed-refs: write prefix chunks

936 - . packed-refs: read optional prefix chunks

937 - . packed-refs: read file format v2

938 - . packed-refs: write file format version 2

939 - . packed-backend: create shell of v2 writes

940 - . config: add config values for packed-refs v2

941 - . packed-backend: create abstraction for writing refs

942 - . packed-backend: extract iterator/updates merge

943 - . packed-backend: extract add_write_error()

944 - . refs: extract packfile format to new file

945 - . chunk-format: parse trailing table of contents

946 - . chunk-format: allow trailing table of contents

947 - . chunk-format: store chunk offset during write

948 - . chunk-format: document trailing table of contents

949 - . chunk-format: number of chunks is optional

950 - . refs: allow loose files without packed-refs

951 - . repository: wire ref extensions to ref backends

952 - . config: fix multi-level bulleted list

953 - . extensions: add refFormat extension

954 - . read-cache: add index.computeHash config option

955 - . hashfile: allow skipping the hash function

956 -

957 - Retracted.

958 -

959 -

960 -* ab/make-bin-wrappers (2022-10-31) 4 commits

961 - . Makefile: simplify $(test_bindir_programs) rule by splitting it up

962 - . Makefile: rename "test_bindir_programs" variable, pre-declare

963 - . Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier

964 - . Makefile: factor sed-powered '#!/bin/sh' munging into a variable

965 -

966 - Resolve issues with the bin-wrappers/% rules where "make

967 - bin-wrappers/git" would generate the script but not "git" itself.

968 - ((that is not an issue but doing the right thing))

969 -

970 - Bad idea.

971 - source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>

857 + Waiting for review.

858 + source: <20221020232532.1128326-1-calvinwan@google.com>

859 +

860 +

861 +* es/doc-creation-factor-fix (2022-07-28) 2 commits

862 + . range-diff: clarify --creation-factor=<factor>

863 + . format-patch: clarify --creation-factor=<factor>

864 +

865 + Expecting a reroll by somebody more familiar with the logic

866 + cf. <xmqqo7wfix7p.fsf@gitster.g>

867 + source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>

What's cooking (2022/12 #06)