From: Elijah Newren Date: Fri, 27 Mar 2020 00:48:48 +0000 (+0000) Subject: t1091: make some tests a little more defensive against failures X-Git-Tag: v2.27.0-rc0~68^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72064ee578a59d4511cab17496c5246af02397f3;p=thirdparty%2Fgit.git t1091: make some tests a little more defensive against failures Reviewed-by: Derrick Stolee Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 44a91205d6..8607a8e6d1 100755 --- 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 &&