git, branch v2.34.0-rc1

Git 2.34-rc1

2021-11-03T20:32:40Z

Signed-off-by: Junio C Hamano

Merge branch 'pw/rebase-r-fixes'

2021-11-03T20:32:29Z

Regression fix. * pw/rebase-r-fixes: rebase -i: fix rewording with --committer-date-is-author-date

Merge branch 'ds/add-rm-with-sparse-index'

2021-11-03T20:32:28Z

Regression fix. * ds/add-rm-with-sparse-index: dir: fix directory-matching bug

Merge branch 'jx/message-fixes'

2021-11-03T20:32:28Z

Fixes to recently added messages. * jx/message-fixes: i18n: fix typos found during l10n for git 2.34.0

Merge branch 'rs/ssh-signing-fix'

2021-11-03T20:32:28Z

Fixes to recently merged topic. * rs/ssh-signing-fix: gpg-interface: avoid buffer overrun in parse_ssh_output() gpg-interface: handle missing " with " gracefully in parse_ssh_output()

rebase -i: fix rewording with --committer-date-is-author-date

2021-11-03T17:44:45Z

baf8ec8d3a (rebase -r: don't write .git/MERGE_MSG when fast-forwarding, 2021-08-20) stopped reading the author script in run_git_commit() when rewording a commit. This is normally safe because "git commit --amend" preserves the authorship. However if the user passes "--committer-date-is-author-date" then we need to read the author date from the author script when rewording. Fix this regression by tightening the check for when it is safe to skip reading the author script. Reported-by: Jonas Kittner Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

dir: fix directory-matching bug

2021-11-03T17:10:36Z

This reverts the change from ed49584 (dir: fix pattern matching on dirs, 2021-09-24), which claimed to fix a directory-matching problem without a test case. It turns out to _create_ a bug, but it is a bit subtle. The bug would have been revealed by the first of two tests being added to t0008-ignores.sh. The first uses a pattern "/git/" inside the a/.gitignores file, which matches against 'a/git/foo' but not 'a/git-foo/bar'. This test would fail before the revert. The second test shows what happens if the test instead uses a pattern "git/" and this test passes both before and after the revert. The difference in these two cases are due to how last_matching_pattern_from_list() checks patterns both if they have the PATTERN_FLAG_MUSTBEDIR and PATTERN_FLAG_NODIR flags. In the case of "git/", the PATTERN_FLAG_NODIR is also provided, making the change in behavior in match_pathname() not affect the end result of last_matching_pattern_from_list(). Reported-by: Glen Choo Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

gpg-interface: avoid buffer overrun in parse_ssh_output()

2021-11-02T00:00:41Z

If the string "key" we found in the output of ssh-keygen happens to be located at the very end of the line, then going four characters further leaves us beyond the end of the string. Explicitly search for the space after "key" to handle a missing one gracefully. Signed-off-by: René Scharfe Acked-by: Fabian Stelzer Signed-off-by: Junio C Hamano

gpg-interface: handle missing " with " gracefully in parse_ssh_output()

2021-11-02T00:00:41Z

If the output of ssh-keygen starts with "Good \"git\" signature for ", but is not followed by " with " for some reason, then parse_ssh_output() uses -1 as the len parameter of xmemdupz(), which in turn will end the program. Reject the signature and carry on instead in that case. Signed-off-by: René Scharfe Acked-by: Fabian Stelzer Signed-off-by: Junio C Hamano

A few more topics before -rc1

2021-11-01T20:48:08Z

Signed-off-by: Junio C Hamano