From edc8f710c74b82391e21b91abf7c418934b056a3 Mon Sep 17 00:00:00 2001 From: Charles Bailey Date: Mon, 22 Jun 2015 14:53:30 +0100 Subject: [PATCH] contrib/subtree: small tidy-up to test There's no need to switch branches to parse another branch's ancestry. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano --- contrib/subtree/t/t7900-subtree.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 001c604dd1..bd3df97936 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -221,9 +221,7 @@ test_expect_success 'check hash of split' ' spl1=$(git subtree split --prefix subdir) && git subtree split --prefix subdir --branch splitbr1test && check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" && - git checkout splitbr1test && - new_hash=$(git rev-parse HEAD~2) && - git checkout mainline && + new_hash=$(git rev-parse splitbr1test~2) && check_equal ''"$new_hash"'' "$subdir_hash" ' -- 2.11.4.GIT