From: Michael J Gruber <git@grubix.eu>
Date: Thu, 7 Sep 2017 14:02:22 +0000 (+0200)
Subject: t6120: clean up state after breaking repo
X-Git-Tag: v2.15.0-rc0~74^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac9b24015c8ecb828485585295c072635bebd73b;p=thirdparty%2Fgit.git

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>
---

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
 '