diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-19 10:35:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-19 10:35:36 -0700 |
| commit | 7dde48ea7aa18de1174628e21510967b0ad71d7c (patch) | |
| tree | abbf393ca977fa7c417017d6bf35c33baf731e7d | |
| parent | 5714722f71ea2eff99ba76fd7b04f61ba0142ea4 (diff) | |
| parent | d952cbb1908b54c6a04f37c8b0924a49cdb5997d (diff) | |
| download | git-7dde48ea7aa18de1174628e21510967b0ad71d7c.tar.gz | |
Merge branch 'lt/request-pull'
* lt/request-pull:
request-pull: resurrect for-linus -> tags/for-linus DWIM
| -rwxr-xr-x | git-request-pull.sh | 6 | ||||
| -rwxr-xr-x | t/t5150-request-pull.sh | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index 5c15997523..d5500fde46 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -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: diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index 75d6b3843a..93e2c65de6 100755 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -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' ' |