git

git:maint

  1. Git
  2. lp:git
  3. maint
Last commit made on 2024-02-23
Get this branch:
git clone -b maint https://git.launchpad.net/git

Branch merges

Branch information

Name:
maint
Repository:
lp:git

Recent commits

3c2a3fd... by Junio C Hamano <email address hidden>

Git 2.44

Signed-off-by: Junio C Hamano <email address hidden>

0d464a4... by Junio C Hamano <email address hidden>

Git 2.43.3

Signed-off-by: Junio C Hamano <email address hidden>

5dc7366... by Junio C Hamano <email address hidden>

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

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

f41f85c... by Junio C Hamano <email address hidden>

Git 2.44-rc2

Signed-off-by: Junio C Hamano <email address hidden>

58aa645... by Junio C Hamano <email address hidden>

Merge branch 'la/trailer-cleanups'

Fix to an already-graduated topic.

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

bc47139... by Jeff King <email address hidden>

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

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 <email address hidden>
Signed-off-by: Jeff King <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

96c8a07... by Junio C Hamano <email address hidden>

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

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

5fdd5b9... by pan93412

l10n: zh_TW: Git 2.44

Co-Authored-By: lumynou5 <email address hidden>
Signed-off-by: Yi-Jyun Pan <email address hidden>

63e81f2... by Jiang Xin

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

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

9c4289b... by Jiang Xin

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

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