index-pack tests: don't leave test repo dirty at end

avar · gitster · commit aa984dbe5ea5 · 2018-10-31T11:12:05.000+09:00
Change a test added in 5105417 ("index-pack: detect local corruption in collision check", 2017-04-01) so that the repository isn't left dirty at the end. Due to the caveats explained in 720dae5 ("config doc: elaborate on fetch.fsckObjects security", 2018-07-27) even a "fetch" that fails will write to the local object store, so let's copy the bit-error test directory before running this test. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
@@ -117,8 +117,10 @@ test_expect_failure 'clone --local detects misnamed objects' '
 '
 
 test_expect_success 'fetch into corrupted repo with index-pack' '
+	cp -R bit-error bit-error-cp &&
+	test_when_finished "rm -rf bit-error-cp" &&
 	(
-		cd bit-error &&
+		cd bit-error-cp &&
 		test_must_fail git -c transfer.unpackLimit=1 \
 			fetch ../no-bit-error 2>stderr &&
 		test_i18ngrep ! -i collision stderr

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,10 @@ test_expect_failure 'clone --local detects misnamed objects' '`
`117`	`117`	`'`
`118`	`118`
`119`	`119`	`test_expect_success 'fetch into corrupted repo with index-pack' '`
	`120`	`+ cp -R bit-error bit-error-cp &&`
	`121`	`+ test_when_finished "rm -rf bit-error-cp" &&`
`120`	`122`	`(`
`121`		`- cd bit-error &&`
	`123`	`+ cd bit-error-cp &&`
`122`	`124`	`test_must_fail git -c transfer.unpackLimit=1 \`
`123`	`125`	`fetch ../no-bit-error 2>stderr &&`
`124`	`126`	`test_i18ngrep ! -i collision stderr`