Merge branch 'rs/ref-filter-signature-fix'

gitster · gitster · commit 261ff512e12c · 2023-07-25T12:05:24.000-07:00
Test fix.

* rs/ref-filter-signature-fix:
  t6300: fix setup with GPGSSH but without GPG
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
@@ -1619,7 +1619,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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,8 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '`
`1619`	`1619`	`test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&`
`1620`	`1620`	`echo "8" >file &&`
`1621`	`1621`	`test_tick &&`
`1622`		`- git commit -a -S -m "file: 8" &&`
	`1622`	`+ git add file &&`
	`1623`	`+ git commit -S -m "file: 8" &&`
`1623`	`1624`	`git tag eighth-signed-ssh`
`1624`	`1625`	`'`
`1625`	`1626`