From 93a6b3f234555006448bfbbaf5ecc3ea19faaa16 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Thu, 17 Aug 2017 08:24:23 +0530 Subject: t3200: cleanup cruft of a test Avoiding the clean up step of tests may help in some cases but in other cases they cause the other unrelated tests to fail for unobvious reasons. It's better to cleanup a few things to keep other tests from failing as a result of it. So, cleanup a cruft left behind by an old test in order for the changes that are to be introduced to be independent of it. Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 9d707d2..002433b 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -559,6 +559,7 @@ test_expect_success 'use --set-upstream-to modify HEAD' ' test_expect_success 'use --set-upstream-to modify a particular branch' ' git branch my13 && git branch --set-upstream-to master my13 && + test_when_finished "git branch --unset-upstream my13" && test "$(git config branch.my13.remote)" = "." && test "$(git config branch.my13.merge)" = "refs/heads/master" ' -- cgit v0.10.2-6-g49f6