diff options
| -rwxr-xr-x | git-request-pull.sh | 4 | ||||
| -rwxr-xr-x | t/t5150-request-pull.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index 7b5c777f0b..d7ba1178ae 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -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; } diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index aec842fa33..da25bc2d1f 100755 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -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 } |