commit: f7cfcf76624ce0ad46c2c40904cc481155d6387b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 18 16:45:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 18 16:46:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7cfcf76
dev-vcs/git: fix tests w/ net-misc/openssh-10.1 The -T arg is new so fall back to old where it fails, which should be fine as older openssh had different behaviour. Closes: https://bugs.gentoo.org/964608 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/files/git-2.51.1-openssh-10.1-tests.patch | 14 ++++++++++++++ dev-vcs/git/git-2.51.1.ebuild | 2 ++ 2 files changed, 16 insertions(+) diff --git a/dev-vcs/git/files/git-2.51.1-openssh-10.1-tests.patch b/dev-vcs/git/files/git-2.51.1-openssh-10.1-tests.patch new file mode 100644 index 000000000000..ffcfd73787da --- /dev/null +++ b/dev-vcs/git/files/git-2.51.1-openssh-10.1-tests.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/964608 +(Tangentially: https://bugs.debian.org/1118288) +https://lore.kernel.org/git/[email protected]/ +--- a/t/t7528-signed-commit-ssh.sh ++++ b/t/t7528-signed-commit-ssh.sh +@@ -82,7 +82,7 @@ test_expect_success GPGSSH 'create signed commits' ' + test_expect_success GPGSSH 'sign commits using literal public keys with ssh-agent' ' + test_when_finished "test_unconfig commit.gpgsign" && + test_config gpg.format ssh && +- eval $(ssh-agent) && ++ eval $(ssh-agent -T || ssh-agent) && + test_when_finished "kill ${SSH_AGENT_PID}" && + test_when_finished "test_unconfig user.signingkey" && + mkdir tmpdir && diff --git a/dev-vcs/git/git-2.51.1.ebuild b/dev-vcs/git/git-2.51.1.ebuild index 9288f91c0ca4..a5192104c3ec 100644 --- a/dev-vcs/git/git-2.51.1.ebuild +++ b/dev-vcs/git/git-2.51.1.ebuild @@ -148,6 +148,8 @@ PATCHES=( # demand from developers. It's opt-in (needs a config option) # and the documentation mentions that it is a Gentoo addition. "${FILESDIR}"/${PN}-2.50.0-diff-implement-config.diff.renames-copies-harder.patch + + "${FILESDIR}"/${PN}-2.51.1-openssh-10.1-tests.patch ) pkg_setup() {
