Andrew's git / gitweb.git / diff
?
t6120: clean up state after breaking repo
authorMichael J Gruber <git@grubix.eu>
Thu, 7 Sep 2017 14:02:22 +0000 (16:02 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Sep 2017 01:37:24 +0000 (10:37 +0900)
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>
t/t6120-describe.sh patch | blob | history
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 7c5728ebd574ce133567da0c8cc50fe5e7c1f5ab..1997ccde56356688cbc66bb77f9a17bd25fd6eae 100755 (executable)
--- 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
 '