X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6010-merge-base.sh;h=1dce123aecd0baa4bbcf122b9a91c478d6e2ef53;hb=16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca;hp=c3a9680e2efe632f6e7cc46c828a393eef959d44;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index c3a9680e..1dce123a 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -46,14 +46,14 @@ H=$(doit 8 H $A $F) test_expect_success 'compute merge-base (single)' \ 'MB=$(git-merge-base G H) && - expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"' + expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"' test_expect_success 'compute merge-base (all)' \ 'MB=$(git-merge-base --all G H) && - expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"' + expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"' test_expect_success 'compute merge-base with show-branch' \ 'MB=$(git-show-branch --merge-base G H) && - expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"' + expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"' test_done