git, branch v2.43.3

Git 2.43.3

2024-02-23T00:13:38Z

Signed-off-by: Junio C Hamano

Merge branch 'la/trailer-cleanups' into maint-2.43

2024-02-23T00:09:45Z

* la/trailer-cleanups: trailer: fix comment/cut-line regression with opts->no_divider

trailer: fix comment/cut-line regression with opts->no_divider

2024-02-20T03:06:18Z

Commit 97e9d0b78a (trailer: find the end of the log message, 2023-10-20) combined two code paths for finding the end of the log message. For the "no_divider" case, we used to use find_trailer_end(), and that has now been rolled into find_end_of_log_message(). But there's a regression; that function returns early when no_divider is set, returning the whole string. That's not how find_trailer_end() behaved. Although it did skip the "---" processing (which is what "no_divider" is meant to do), we should still respect ignored_log_message_bytes(), which covers things like comments, "commit -v" cut lines, and so on. The bug is actually in the interpret-trailers command, but the obvious way to experience it is by running "commit -v" with a "--trailer" option. The new trailer will be added at the end of the verbose diff, rather than before it (and consequently will be ignored entirely, since everything after the diff's intro scissors line is thrown away). I've added two tests here: one for interpret-trailers directly, which shows the bug via the parsing routines, and one for "commit -v". The fix itself is pretty simple: instead of returning early, no_divider just skips the "---" handling but still calls ignored_log_message_bytes(). Reported-by: Philippe Blain Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Git 2.43.2

2024-02-13T22:44:51Z

Signed-off-by: Junio C Hamano

Merge branch 'pb/template-for-single-commit-pr' into maint-2.43

2024-02-13T22:44:51Z

Doc update. * pb/template-for-single-commit-pr: .github/PULL_REQUEST_TEMPLATE.md: add a note about single-commit PRs

Merge branch 'jc/bisect-doc' into maint-2.43

2024-02-13T22:44:51Z

Doc update. * jc/bisect-doc: bisect: document command line arguments for "bisect start" bisect: document "terms" subcommand more fully

Merge branch 'js/win32-retry-pipe-write-on-enospc' into maint-2.43

2024-02-13T22:44:51Z

Update to the code that writes to pipes on Windows. * js/win32-retry-pipe-write-on-enospc: win32: special-case `ENOSPC` when writing to a pipe

Merge branch 'tb/pack-bitmap-drop-unused-struct-member' into maint-2.43

2024-02-13T22:44:51Z

Code clean-up. * tb/pack-bitmap-drop-unused-struct-member: pack-bitmap: drop unused `reuse_objects`

Merge branch 'jt/p4-spell-re-with-raw-string' into maint-2.43

2024-02-13T22:44:50Z

"git p4" update to squelch warnings from Python. * jt/p4-spell-re-with-raw-string: git-p4: use raw string literals for regular expressions

Merge branch 'jc/coc-whitespace-fix' into maint-2.43

2024-02-13T22:44:50Z

Docfix. * jc/coc-whitespace-fix: CoC: whitespace fix