diff options
| author | Charles Bailey <cbailey32@bloomberg.net> | 2015-06-22 14:53:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-22 15:30:00 -0700 |
| commit | edc8f710c74b82391e21b91abf7c418934b056a3 (patch) | |
| tree | 933215734f4a2f2babb45e31505844a7eafec17c | |
| parent | d417c244ec72f7300478fce035c5e49bfdc07537 (diff) | |
| download | git-edc8f710c74b82391e21b91abf7c418934b056a3.tar.gz | |
contrib/subtree: small tidy-up to testcb/subtree-tests-update
There's no need to switch branches to parse another branch's ancestry.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 4 |
1 files changed, 1 insertions, 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" ' |