diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-04-24 07:15:37 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-05-01 11:02:21 -0700 |
| commit | 50ab6558bf688e15048e189bdaf9174b217e1748 (patch) | |
| tree | d09eb13f6905d997371e38e5edd4e39b53757f06 /contrib/git-resurrect.sh | |
| parent | tests for request-pull (diff) | |
| download | tgif-50ab6558bf688e15048e189bdaf9174b217e1748.tar.xz | |
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 'contrib/git-resurrect.sh')
| -rwxr-xr-x | contrib/git-resurrect.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh index c364dda696..a4ed4c3c62 100755 --- a/contrib/git-resurrect.sh +++ b/contrib/git-resurrect.sh @@ -9,6 +9,7 @@ other/Merge <other> into <name> (respectively) commit subjects, which is rather slow but allows you to resurrect other people's topic branches." +OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ git resurrect $USAGE -- |