Skip to content

Commit dc347e9

Browse files
committed
Merge branch 'jc/maint-request-pull-for-tag'
* jc/maint-request-pull-for-tag: request-pull: explicitly ask tags/$name to be pulled
2 parents 715d130 + 2ad9ba0 commit dc347e9

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ The resulting msg.txt file begins like so:
109109

110110
are available in the git repository at:
111111

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

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

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

143143
------------
144-
$ git pull example.com:/git/froboz.git/ frotz-for-xyzzy
144+
$ git pull example.com:/git/froboz.git/ tags/frotz-for-xyzzy
145145
------------
146146

147147
This operation will always open an editor to allow the integrator to fine

git-request-pull.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ die "fatal: No commits in common between $base and $head"
6363
find_matching_ref='
6464
sub abbr {
6565
my $ref = shift;
66-
if ($ref =~ s|refs/heads/|| || $ref =~ s|refs/tags/||) {
66+
if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
6767
return $ref;
6868
} else {
6969
return $ref;

t/t5150-request-pull.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,7 @@ test_expect_success 'request names an appropriate branch' '
179179
read repository &&
180180
read branch
181181
} <digest &&
182-
{
183-
test "$branch" = full ||
184-
test "$branch" = master ||
185-
test "$branch" = for-upstream
186-
}
182+
test "$branch" = tags/full
187183
188184
'
189185

0 commit comments

Comments
 (0)