t1091: make some tests a little more defensive against failures

newren · gitster · commit 72064ee578a5 · 2020-03-27T11:33:29.000-07:00
Reviewed-by: Derrick Stolee &lt;dstolee@microsoft.com&gt;
Signed-off-by: Elijah Newren &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
@@ -278,6 +278,7 @@ test_expect_success 'cone mode: add parent path' '
 '
 
 test_expect_success 'revert to old sparse-checkout on bad update' '
+	test_when_finished git -C repo sparse-checkout disable &&
 	test_when_finished git -C repo reset --hard &&
 	git -C repo sparse-checkout set deep &&
 	echo update >repo/deep/deeper2/a &&
@@ -328,6 +329,7 @@ test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status'
 '
 
 test_expect_success 'cone mode: set with core.ignoreCase=true' '
+	rm repo/.git/info/sparse-checkout &&
 	git -C repo sparse-checkout init --cone &&
 	git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&
 	cat >expect <<-\EOF &&

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,7 @@ test_expect_success 'cone mode: add parent path' '`
`278`	`278`	`'`
`279`	`279`
`280`	`280`	`test_expect_success 'revert to old sparse-checkout on bad update' '`
	`281`	`+ test_when_finished git -C repo sparse-checkout disable &&`
`281`	`282`	`test_when_finished git -C repo reset --hard &&`
`282`	`283`	`git -C repo sparse-checkout set deep &&`
`283`	`284`	`echo update >repo/deep/deeper2/a &&`
`@@ -328,6 +329,7 @@ test_expect_success 'sparse-checkout (init\|set\|disable) fails with dirty status'`
`328`	`329`	`'`
`329`	`330`
`330`	`331`	`test_expect_success 'cone mode: set with core.ignoreCase=true' '`
	`332`	`+ rm repo/.git/info/sparse-checkout &&`
`331`	`333`	`git -C repo sparse-checkout init --cone &&`
`332`	`334`	`git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&`
`333`	`335`	`cat >expect <<-\EOF &&`