t6120: clean up state after breaking repo

mjg · gitster · commit ac9b24015c8e · 2017-09-08T10:37:24.000+09:00
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 &lt;git@grubix.eu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ test_expect_success 'describe chokes on severely broken submodules' '`
`275`	`275`	`'`
`276`	`276`	`test_expect_success 'describe ignoring a borken submodule' '`
`277`	`277`	`git describe --broken >out &&`
	`278`	`+ test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&`
`278`	`279`	`grep broken out`
`279`	`280`	`'`
`280`	`281`