On Thu, Nov 08, 2007 at 09:14:02AM +0000, Pierre Habouzit wrote:
> On Thu, Nov 08, 2007 at 07:09:29AM +0000, Junio C Hamano wrote:
> > The 'automagic parseopt' support corrupted non option parameters
> > that had IFS characters in them. The worst case can be seen
> > when it has a non option parameter like this:
> >
> > $1=" * some string blech"
> >
> > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
>
> > - parseopt_extra=
> > - [ -n "$OPTIONS_KEEPDASHDASH" ] &&
> > - parseopt_extra="$parseopt_extra --keep-dashdash"
> > + [ -n "$OPTIONS_KEEPDASHDASH" ] && parseopt_extra="--keep-dashdash"
>
> oh and this part is wrong because you're affected by $parseopt_extra
> environment poisonning. And you have to fix git-clone.sh that uses
> git-rev-parse --parsopt directly with the same call too (as it doesn't
> use git-sh-setup).
Here is a patch that should fix all those issues at once, replace
yours. I tested it with this minimal test:
$ cat parseopt.sh
#!/bin/sh
OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\
foo
--
"
. git-sh-setup
for i in "$@"; do echo "$i"; done
$ ./parseopt.sh " * hahahah bleh"
--
* hahahah bleh
$ ./parseopt.sh -asd " * hahahah bleh"
error: unknown switch `a'
usage: foo
$ echo $?
129
which fix your bug, and still behaves as advertised.
From 3c2095533094ff6d82272dc36d9f576b0e81d135 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@xxxxxxxxxx>
Date: Thu, 8 Nov 2007 10:32:11 +0100
Subject: [PATCH] Prevent eval of $(git-rev-parse --parseopt) output to be shell-expansed.
Thanks to Junio for having spotted this.
Use the preferred $(...) form rather than ``
Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
---
git-clone.sh | 2 +-
git-sh-setup.sh | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/git-clone.sh b/git-clone.sh
index f216f03..24ad179 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -36,7 +36,7 @@ usage() {
exec "$0" -h
}
-eval `echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`
+eval "$(echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
get_repo_base() {
(
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index e1cf885..5aa62dd 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -23,9 +23,13 @@ if test -n "$OPTIONS_SPEC"; then
parseopt_extra=
[ -n "$OPTIONS_KEEPDASHDASH" ] &&
- parseopt_extra="$parseopt_extra --keep-dashdash"
+ parseopt_extra="--keep-dashdash"
- eval `echo "$OPTIONS_SPEC" | git rev-parse --parseopt $parseopt_extra -- "$@" || echo exit $?`
+ eval "$(
+ echo "$OPTIONS_SPEC" |
+ git rev-parse --parseopt $parseopt_extra -- "$@" ||
+ echo exit $?
+ )"
else
usage() {
die "Usage: $0 $USAGE"
--
1.5.3.5.1598.gdef4e-dirty
Attachment:
pgpghbhE708Gc.pgp
Description: PGP signature
