undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-request-pull-for-tag'

Browse Source 
* jc/maint-request-pull-for-tag:
  request-pull: explicitly ask tags/$name to be pulled
This commit is contained in:
Junio C Hamano 2012-02-07 12:57:10 -08:00
commit dc347e9f6a
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/howto/using-signed-tag-in-pull-request.txt
View File

@ -109,7 +109,7 @@ The resulting msg.txt file begins like so:
are available in the git repository at: 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...: for you to fetch changes up to 703f05ad5835c...:
@ -141,7 +141,7 @@ After receiving such a pull request message, the integrator fetches and
integrates the tag named in the request, with: 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 This operation will always open an editor to allow the integrator to fine

2
git-request-pull.sh
View File

@ -63,7 +63,7 @@ die "fatal: No commits in common between $base and $head"
find_matching_ref=' find_matching_ref='
sub abbr { sub abbr {
my $ref = shift; my $ref = shift;
if ($ref =~ s|refs/heads/|| || $ref =~ s|refs/tags/||) { if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
return $ref; return $ref;
} else { } else {
return $ref; return $ref;

6
t/t5150-request-pull.sh
View File

@ -179,11 +179,7 @@ test_expect_success 'request names an appropriate branch' '
read repository && read repository &&
read branch read branch
} <digest && } <digest &&
{ test "$branch" = tags/full
test "$branch" = full ||
test "$branch" = master ||
test "$branch" = for-upstream
}
' '