diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-04-24 12:15:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-01 18:02:21 (GMT) |
| commit | 50ab6558bf688e15048e189bdaf9174b217e1748 (patch) | |
| tree | d09eb13f6905d997371e38e5edd4e39b53757f06 /t/t5150-request-pull.sh | |
| parent | 30c56eaa2e7ab230a89a6fdc76682d2afaf5d4b1 (diff) | |
| download | git-50ab6558bf688e15048e189bdaf9174b217e1748.zip git-50ab6558bf688e15048e189bdaf9174b217e1748.tar.gz git-50ab6558bf688e15048e189bdaf9174b217e1748.tar.bz2 | |
request-pull: protect against OPTIONS_KEEPDASHDASH from environment
Like most git commands, request-pull supports a -- delimiter to allow
callers to pass arguments that would otherwise be treated as an option
afterwards. The internal OPTIONS_KEEPDASHDASH variable is passed
empty to git-sh-setup to indicate that request-pull itself does not
care about the position of the -- delimiter. But if the user has
that variable in her environment, request-pull will see the “--” and
fail.
Empty it explicitly to guard against this. While at it, make the
corresponding fix to git-resurrect, too (all other scripts in git.git
already protect themselves).
Acked-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5150-request-pull.sh')
| -rw-r--r-- | t/t5150-request-pull.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index e012a36..4c7f48a 100644 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -211,4 +211,18 @@ test_expect_success 'pull request format' ' ' +test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' ' + + ( + cd local && + OPTIONS_KEEPDASHDASH=Yes && + export OPTIONS_KEEPDASHDASH && + git checkout initial && + git merge --ff-only master && + git push origin master:for-upstream && + git request-pull -- initial "$downstream_url" >../request + ) + +' + test_done |