aboutsummaryrefslogtreecommitdiff
path: root/git-fetch.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-01-30 13:11:49 -0500
committerJunio C Hamano <junkio@cox.net>2007-01-31 13:09:58 -0800
commit4a91a1f37e8813bf3b7de00de5b3a7ab1df89451 (patch)
treee1e155d13b77658228e99d203b60f791a642b2f8 /git-fetch.sh
parent76f8a302c73d7fe26b2034ab4d1dde64de39c8df (diff)
downloadgit-4a91a1f37e8813bf3b7de00de5b3a7ab1df89451.tar.gz
git-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>
Diffstat (limited to 'git-fetch.sh')
-rwxr-xr-xgit-fetch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index c1f6e1e84..357cac28b 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)