Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'lt/request-pull'
* lt/request-pull:
  request-pull: resurrect for-linus -> tags/for-linus DWIM
  • Loading branch information
Junio C Hamano committed May 19, 2014
2 parents 5714722 + d952cbb commit 7dde48e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
6 changes: 6 additions & 0 deletions git-request-pull.sh
Expand Up @@ -119,6 +119,12 @@ then
status=1
fi

# Special case: turn "for_linus" to "tags/for_linus" when it is correct
if test "$ref" = "refs/tags/$pretty_remote"
then
pretty_remote=tags/$pretty_remote
fi

url=$(git ls-remote --get-url "$url")

git show -s --format='The following changes since commit %H:
Expand Down
8 changes: 7 additions & 1 deletion t/t5150-request-pull.sh
Expand Up @@ -223,7 +223,13 @@ test_expect_success 'pull request format' '
git request-pull initial "$downstream_url" tags/full:refs/tags/full
) >request &&
sed -nf fuzz.sed <request >request.fuzzy &&
test_i18ncmp expect request.fuzzy
test_i18ncmp expect request.fuzzy &&
(
cd local &&
git request-pull initial "$downstream_url" full
) >request &&
grep ' tags/full$'
'

test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
Expand Down

0 comments on commit 7dde48e

Please sign in to comment.