summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaartic Sivaraam <kaarticsivaraam91196@gmail.com>2017-08-17 02:54:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-17 19:51:37 (GMT)
commit93a6b3f234555006448bfbbaf5ecc3ea19faaa16 (patch)
treef478da1874ab6fcc741bc8881bcf1a25393f895c
parentb3622a4ee94e4916cd05e6d96e41eeb36b941182 (diff)
downloadgit-93a6b3f234555006448bfbbaf5ecc3ea19faaa16.zip
git-93a6b3f234555006448bfbbaf5ecc3ea19faaa16.tar.gz
git-93a6b3f234555006448bfbbaf5ecc3ea19faaa16.tar.bz2
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 <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3200-branch.sh1
1 files changed, 1 insertions, 0 deletions
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"
'