Merge branch 'jc/request-pull-show-head-4' into next

* jc/request-pull-show-head-4:
  request-pull: do not emit "tag" before the tagname
This commit is contained in:
Junio C Hamano
2011-12-19 17:06:43 -08:00
2 changed files with 2 additions and 4 deletions

View File

@@ -63,10 +63,8 @@ die "fatal: No commits in common between $base and $head"
find_matching_ref='
sub abbr {
my $ref = shift;
if ($ref =~ s|refs/heads/||) {
if ($ref =~ s|refs/heads/|| || $ref =~ s|refs/tags/||) {
return $ref;
} elsif ($ref =~ s|refs/tags/||) {
return "tag $ref";
} else {
return $ref;
}

View File

@@ -180,7 +180,7 @@ test_expect_success 'request names an appropriate branch' '
read branch
} <digest &&
{
test "$branch" = tag--full ||
test "$branch" = full ||
test "$branch" = master ||
test "$branch" = for-upstream
}