summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-11 14:20:09 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-11 14:47:20 -0800
commit2c817df25d54b557d6cac0800cacfd0a255cd56d (patch)
tree0217463c24b8d982aea3d83a165c1875e988c495 /t/t6010-merge-base.sh
parenta94d9948da539fdafc26c74afb335b2fe9f8f21d (diff)
downloadgit-2c817df25d54b557d6cac0800cacfd0a255cd56d.tar.gz
name-rev: do not omit leading components of ref name.
In a repository with mainto/1.0 (to keep maintaining the 1.0.X series) and fixo/1.0 (to keep fixes that apply to both 1.0.X series and upwards) branches, "git-name-rev mainto/1.0" answered just "1.0" making things ambiguous. Show refnames unambiguously like show-branch does. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6010-merge-base.sh')
-rwxr-xr-xt/t6010-merge-base.sh6
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