aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-20 13:25:27 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-20 13:25:27 -0800
commit835fbdb67aa011639e1502e42e831be058ee7e32 (patch)
treebbcaf50e10020c89fbb42c4fa5dc30d1e41c3e66 /t
parent4d466b69fe4695ffff1de1f494dada67074d2b50 (diff)
parentf032d66ddb0cc81807be14c6a9052367df6d1cbc (diff)
downloadgit-835fbdb67aa011639e1502e42e831be058ee7e32.tar.gz
git-835fbdb67aa011639e1502e42e831be058ee7e32.tar.xz
Merge branch 'jc/request-pull-show-head-4'
* jc/request-pull-show-head-4: request-pull: do not emit "tag" before the tagname request-pull: update the "pull" command generation logic
Diffstat (limited to 't')
-rwxr-xr-xt/t5150-request-pull.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index ea6f692ba..da25bc2d1 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -67,9 +67,11 @@ test_expect_success 'setup: two scripts for reading pull requests' '
cat <<-\EOT >read-request.sed &&
#!/bin/sed -nf
+ # Note that a request could ask for "tag $tagname"
/ in the git repository at:$/!d
n
/^$/ n
+ s/ tag \([^ ]*\)$/ tag--\1/
s/^[ ]*\(.*\) \([^ ]*\)/please pull\
\1\
\2/p
@@ -178,6 +180,7 @@ test_expect_success 'request names an appropriate branch' '
read branch
} <digest &&
{
+ test "$branch" = full ||
test "$branch" = master ||
test "$branch" = for-upstream
}