summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-request-pull.sh4
-rwxr-xr-xt/t5150-request-pull.sh2
2 files changed, 2 insertions, 4 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 7b5c777..d7ba117 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 aec842f..da25bc2 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
}