diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 13:11:49 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-01-31 13:09:58 -0800 |
| commit | 4a91a1f37e8813bf3b7de00de5b3a7ab1df89451 (patch) | |
| tree | e1e155d13b77658228e99d203b60f791a642b2f8 | |
| parent | Don't coredump on bad refs in update-server-info. (diff) | |
| download | tgif-4a91a1f37e8813bf3b7de00de5b3a7ab1df89451.tar.xz | |
Escape --upload-pack from expr.
Recent commit ae1dffcb28ee89a23f8d2747be65e17c8eab1690 by Junio
changed the way --upload-pack was passed around between clone,
fetch and ls-remote and modified the handling of the command
line parameter parsing.
Unfortunately FreeBSD 6.1 insists that the expression
expr --upload-pack=git-upload-pack : '-[^=]*=\(.*\)'
is illegal, as the --upload-pack option is not supported by their
implementation of expr.
Elsewhere in Git we use z as a leading prefix of both arguments,
ensuring the -- isn't seen by expr.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-clone.sh | 2 | ||||
| -rwxr-xr-x | git-fetch.sh | 2 | ||||
| -rwxr-xr-x | git-ls-remote.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/git-clone.sh b/git-clone.sh index 3d83acbfc8..4ddfa774ec 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -123,7 +123,7 @@ while shift upload_pack="--upload-pack=$1" ;; *,--upload-pack=*) - upload_pack=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)') ;; + upload_pack=--upload-pack=$(expr "z$1" : 'z-[^=]*=\(.*\)') ;; 1,--depth) usage;; *,--depth) shift diff --git a/git-fetch.sh b/git-fetch.sh index c1f6e1e841..357cac28b2 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -37,7 +37,7 @@ do ;; --upl=*|--uplo=*|--uploa=*|--upload=*|\ --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*) - exec=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)') + exec=--upload-pack=$(expr "z$1" : 'z-[^=]*=\(.*\)') shift ;; -f|--f|--fo|--for|--forc|--force) diff --git a/git-ls-remote.sh b/git-ls-remote.sh index e6f574b99b..8ea5c5e816 100755 --- a/git-ls-remote.sh +++ b/git-ls-remote.sh @@ -27,7 +27,7 @@ do shift;; -u=*|--u=*|--up=*|--upl=*|--uplo=*|--uploa=*|--upload=*|\ --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*) - exec=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)') + exec=--upload-pack=$(expr "z$1" : 'z-[^=]*=\(.*\)') shift;; --) shift; break ;; |