diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-01-13 16:39:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-13 16:39:17 -0800 |
| commit | e99c2fbdda590b0d5fb5bd89001e6d9df8342564 (patch) | |
| tree | d5948e57db15e6c9bf78826b52229f78accc76e1 /t | |
| parent | GIT 1.0.9 (diff) | |
| parent | Documentation: git-reset - interrupted workflow. (diff) | |
| download | tgif-e99c2fbdda590b0d5fb5bd89001e6d9df8342564.tar.xz | |
GIT 1.0.10
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6010-merge-base.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index c3a9680e2e..1dce123aec 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 |