git, branch v2.44.0

Git 2.44

2024-02-23T00:14:53Z

Signed-off-by: Junio C Hamano

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

Git 2.44-rc2

2024-02-20T05:01:01Z

Signed-off-by: Junio C Hamano

Merge branch 'la/trailer-cleanups'

2024-02-20T04:58:06Z

Fix to an already-graduated topic. * 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

Merge tag 'l10n-2.44.0-rnd3' of https://github.com/git-l10n/git-po

2024-02-19T16:35:40Z

l10n-2.44.0-rnd3 * tag 'l10n-2.44.0-rnd3' of https://github.com/git-l10n/git-po: l10n: zh_TW: Git 2.44 l10n: zh_CN: for git 2.44 rounds l10n: Update German translation l10n: tr: Update Turkish translations for 2.44 l10n: fr.po: v2.44.0 round 3 l10n: bg.po: Updated Bulgarian translation (5610t) l10n: sv.po: Update Swedish translation l10n: Update Catalan translation l10n: po-id for 2.44 (round 1) l10n: ci: disable cache for setup-go to suppress warnings l10n: ci: remove unused param for add-pr-comment@v2 l10n: uk: v2.44 update (round 3) l10n: uk: v2.44 update (round 2) l10n: uk: v2.44 localization update l10n: bump Actions versions in l10n.yml

l10n: zh_TW: Git 2.44

2024-02-18T13:03:43Z

Co-Authored-By: lumynou5 Signed-off-by: Yi-Jyun Pan

Merge branch 'master' of github.com:ralfth/git

2024-02-18T12:33:01Z

* 'master' of github.com:ralfth/git: l10n: Update German translation

Merge branch 'po-id' of github.com:bagasme/git-po

2024-02-18T12:31:55Z

* 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.44 (round 1)