[PATCH] Escape --upload-pack from expr.
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:42:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- I did a quick search, I don't think there are any others. git-clone.sh | 2 +- git-fetch.sh | 2 +- git-ls-remote.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-clone.sh b/git-clone.sh
index 3d83acb..4ddfa77 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 c1f6e1e..357cac2 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 e6f574b..8ea5c5e 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 ;;
--
1.5.0.rc2.81.g73a2