aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2023-07-16 10:17:35 +0200
committerJunio C Hamano <gitster@pobox.com>2023-07-17 09:15:18 -0700
commit065135fc0bf3c859fcf63abe2e413ccc32a9cc50 (patch)
tree2a8666b26493a9355cd2796275d087083b7b5cac
parent26c9c03f0a9c26f5e41af19f3cbd6f4dda7006b3 (diff)
downloadgit-065135fc0bf3c859fcf63abe2e413ccc32a9cc50.tar.xz
t6300: fix setup with GPGSSH but without GPG
In a test introduced by 26c9c03f0a (ref-filter: add new "signature" atom, 2023-06-04) the file named "file" is added by a setup step that requires GPG and modified by a second setup step that requires GPGSSH. Systems lacking the first prerequisite skip the initial setup step and then "git commit -a" in the second one doesn't find the modified file. Add it explicitly. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6300-for-each-ref.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 6e6ec852b5..1180c3254c 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -1584,7 +1584,8 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
echo "8" >file &&
test_tick &&
- git commit -a -S -m "file: 8" &&
+ git add file &&
+ git commit -S -m "file: 8" &&
git tag eighth-signed-ssh
'