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

Merge branch 'lt/request-pull'

Browse Source 
* lt/request-pull:
  request-pull: resurrect for-linus -> tags/for-linus DWIM
This commit is contained in:
Junio C Hamano 2014-05-19 10:35:36 -07:00
commit 7dde48ea7a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-request-pull.sh
View File

@ -119,6 +119,12 @@ then
status=1 status=1
fi 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") url=$(git ls-remote --get-url "$url")
git show -s --format='The following changes since commit %H: git show -s --format='The following changes since commit %H:

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

@ -223,7 +223,13 @@ test_expect_success 'pull request format' '
git request-pull initial "$downstream_url" tags/full:refs/tags/full git request-pull initial "$downstream_url" tags/full:refs/tags/full
) >request && ) >request &&
sed -nf fuzz.sed <request >request.fuzzy && 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' ' test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '