Skip to content

Commit

Permalink
request-pull: explicitly ask tags/$name to be pulled
Browse files Browse the repository at this point in the history
When asking for a tag to be pulled, disambiguate by leaving tags/ prefix
in front of the name of the tag. E.g.

    ... in the git repository at:

      git://example.com/git/git.git/ tags/v1.2.3

    for you to fetch changes up to 123456...

This way, older versions of "git pull" can be used to respond to such a
request more easily, as "git pull $URL v1.2.3" did not DWIM to fetch
v1.2.3 tag in older versions. Also this makes it clearer for humans that
the pull request is made for a tag and he should anticipate a signed one.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Feb 1, 2012
1 parent 11b17af commit 2ad9ba0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Documentation/howto/using-signed-tag-in-pull-request.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ The resulting msg.txt file begins like so:

are available in the git repository at:

example.com:/git/froboz.git frotz-for-xyzzy
example.com:/git/froboz.git tags/frotz-for-xyzzy

for you to fetch changes up to 703f05ad5835c...:

Expand Down Expand Up @@ -141,7 +141,7 @@ After receiving such a pull request message, the integrator fetches and
integrates the tag named in the request, with:

------------
$ git pull example.com:/git/froboz.git/ frotz-for-xyzzy
$ git pull example.com:/git/froboz.git/ tags/frotz-for-xyzzy
------------

This operation will always open an editor to allow the integrator to fine
Expand Down
2 changes: 1 addition & 1 deletion git-request-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ die "fatal: No commits in common between $base and $head"
find_matching_ref='
sub abbr {
my $ref = shift;
if ($ref =~ s|refs/heads/|| || $ref =~ s|refs/tags/||) {
if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
return $ref;
} else {
return $ref;
Expand Down
6 changes: 1 addition & 5 deletions t/t5150-request-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@ test_expect_success 'request names an appropriate branch' '
read repository &&
read branch
} <digest &&
{
test "$branch" = full ||
test "$branch" = master ||
test "$branch" = for-upstream
}
test "$branch" = tags/full
'

Expand Down

0 comments on commit 2ad9ba0

Please sign in to comment.