Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 7dde48e

Browse files
committed
Merge branch 'lt/request-pull'
* lt/request-pull: request-pull: resurrect for-linus -> tags/for-linus DWIM
2 parents 5714722 + d952cbb commit 7dde48e

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

git-request-pull.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ then
119119
status=1
120120
fi
121121

122+
# Special case: turn "for_linus" to "tags/for_linus" when it is correct
123+
if test "$ref" = "refs/tags/$pretty_remote"
124+
then
125+
pretty_remote=tags/$pretty_remote
126+
fi
127+
122128
url=$(git ls-remote --get-url "$url")
123129

124130
git show -s --format='The following changes since commit %H:

t/t5150-request-pull.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,13 @@ test_expect_success 'pull request format' '
223223
git request-pull initial "$downstream_url" tags/full:refs/tags/full
224224
) >request &&
225225
sed -nf fuzz.sed <request >request.fuzzy &&
226-
test_i18ncmp expect request.fuzzy
226+
test_i18ncmp expect request.fuzzy &&
227+
228+
(
229+
cd local &&
230+
git request-pull initial "$downstream_url" full
231+
) >request &&
232+
grep ' tags/full$'
227233
'
228234

229235
test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '

0 commit comments

Comments
 (0)