summaryrefslogtreecommitdiff
path: root/t/t5150-request-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 19:59:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-19 19:59:57 (GMT)
commitf032d66ddb0cc81807be14c6a9052367df6d1cbc (patch)
tree76af5ebe26b8406b9db11223252df78aa5194bda /t/t5150-request-pull.sh
parentfe46fa9d267fc5465b320d0d2877de45333efeb8 (diff)
downloadgit-f032d66ddb0cc81807be14c6a9052367df6d1cbc.zip
git-f032d66ddb0cc81807be14c6a9052367df6d1cbc.tar.gz
git-f032d66ddb0cc81807be14c6a9052367df6d1cbc.tar.bz2
request-pull: do not emit "tag" before the tagname
The whole point of the recent update to allow "git pull $url $tagname" is so that the integrator does not have to store the (signed) tag that is used to convey authenticity to be recorded in the resulting merge in the local repository's tag namespace. Asking for a merge be made with "git pull $url tag $tagname" defeats it. Note that the request can become ambiguous if the requestor has a branch with the same name as the tag, but that is not a new problem limited to pulling. I wouldn't mind if somebody wants to add disambiguation to the find_matching_ref logic in the script as a separate patch, though. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5150-request-pull.sh')
-rwxr-xr-xt/t5150-request-pull.sh2
1 files changed, 1 insertions, 1 deletions
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
}