summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@grubix.eu>2017-09-07 16:02:22 +0200
committerJunio C Hamano <gitster@pobox.com>2017-09-08 10:37:24 +0900
commitac9b24015c8ecb828485585295c072635bebd73b (patch)
tree98a38b04965d8c3e70cf27ac98bb6e2d715d7d69
parenta24fa652962007e03ac02e25952bf45ddff5bfde (diff)
downloadgit-ac9b24015c8ecb828485585295c072635bebd73b.tar.gz
t6120: clean up state after breaking repo
t6120 breaks the repo state intentionally in the last tests. Clean up the breakage afterwards (and before adding more tests). Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6120-describe.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 7c5728ebd5..1997ccde56 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -275,6 +275,7 @@ test_expect_success 'describe chokes on severely broken submodules' '
'
test_expect_success 'describe ignoring a borken submodule' '
git describe --broken >out &&
+ test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
grep broken out
'