{"thread":{"id":"4684","subject":"[PATCH] Fix expr usage for FreeBSD","startedAt":"2006-06-27T16:54:26Z","lastAt":"2006-06-27T16:54:26Z","messageCount":1,"participants":["Dennis Stosberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"22676","messageId":"20060627165426.G3f0d11f5@leonov.stosberg.net","threadId":"4684","inReplyTo":null,"subject":"[PATCH] Fix expr usage for FreeBSD","fromName":"Dennis Stosberg","fromEmail":"dennis@stosberg.net","sentAt":"2006-06-27T16:54:26Z","receivedAt":"2006-06-27T16:54:26Z","isPatch":true,"sender":{"key":"dennis@stosberg.net","avatar":null},"body":"Some implementations of \"expr\" (e.g. FreeBSD's) fail, if an\nargument starts with a dash.\n\nSigned-off-by: Dennis Stosberg <dennis@stosberg.net>\n---\n git-am.sh          |    2 +-\n git-clone.sh       |    2 +-\n git-commit.sh      |   18 +++++++++---------\n git-merge.sh       |    2 +-\n git-pull.sh        |    2 +-\n git-quiltimport.sh |    4 ++--\n git-rebase.sh      |    2 +-\n 7 files changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex 4232e27..679045a 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -97,7 +97,7 @@ while case \"$#\" in 0) break;; esac\n do\n \tcase \"$1\" in\n \t-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)\n-\tdotest=`expr \"$1\" : '-[^=]*=\\(.*\\)'`; shift ;;\n+\tdotest=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`; shift ;;\n \t-d|--d|--do|--dot|--dote|--dotes|--dotest)\n \tcase \"$#\" in 1) usage ;; esac; shift\n \tdotest=\"$1\"; shift;;\ndiff --git a/git-clone.sh b/git-clone.sh\nindex 6fa0daa..6a14b25 100755\n--- a/git-clone.sh\n+++ b/git-clone.sh\n@@ -133,7 +133,7 @@ while\n \t*,--reference)\n \t\tshift; reference=\"$1\" ;;\n \t*,--reference=*)\n-\t\treference=`expr \"$1\" : '--reference=\\(.*\\)'` ;;\n+\t\treference=`expr \"z$1\" : 'z--reference=\\(.*\\)'` ;;\n \t*,-o|*,--or|*,--ori|*,--orig|*,--origi|*,--origin)\n \t\tcase \"$2\" in\n \t\t'')\ndiff --git a/git-commit.sh b/git-commit.sh\nindex d7f3ade..7e50cf3 100755\n--- a/git-commit.sh\n+++ b/git-commit.sh\n@@ -223,13 +223,13 @@ do\n   -F*|-f*)\n       no_edit=t\n       log_given=t$log_given\n-      logfile=`expr \"$1\" : '-[Ff]\\(.*\\)'`\n+      logfile=`expr \"z$1\" : 'z-[Ff]\\(.*\\)'`\n       shift\n       ;;\n   --F=*|--f=*|--fi=*|--fil=*|--file=*)\n       no_edit=t\n       log_given=t$log_given\n-      logfile=`expr \"$1\" : '-[^=]*=\\(.*\\)'`\n+      logfile=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n       shift\n       ;;\n   -a|--a|--al|--all)\n@@ -237,7 +237,7 @@ do\n       shift\n       ;;\n   --au=*|--aut=*|--auth=*|--autho=*|--author=*)\n-      force_author=`expr \"$1\" : '-[^=]*=\\(.*\\)'`\n+      force_author=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n       shift\n       ;;\n   --au|--aut|--auth|--autho|--author)\n@@ -277,11 +277,11 @@ do\n       log_given=m$log_given\n       if test \"$log_message\" = ''\n       then\n-          log_message=`expr \"$1\" : '-m\\(.*\\)'`\n+          log_message=`expr \"z$1\" : 'z-m\\(.*\\)'`\n       else\n           log_message=\"$log_message\n \n-`expr \"$1\" : '-m\\(.*\\)'`\"\n+`expr \"z$1\" : 'z-m\\(.*\\)'`\"\n       fi\n       no_edit=t\n       shift\n@@ -290,11 +290,11 @@ do\n       log_given=m$log_given\n       if test \"$log_message\" = ''\n       then\n-          log_message=`expr \"$1\" : '-[^=]*=\\(.*\\)'`\n+          log_message=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n       else\n           log_message=\"$log_message\n \n-`expr \"$1\" : '-[^=]*=\\(.*\\)'`\"\n+`expr \"z$1\" : 'zq-[^=]*=\\(.*\\)'`\"\n       fi\n       no_edit=t\n       shift\n@@ -321,7 +321,7 @@ do\n   --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\\\n   --reedit-messag=*|--reedit-message=*)\n       log_given=t$log_given\n-      use_commit=`expr \"$1\" : '-[^=]*=\\(.*\\)'`\n+      use_commit=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n       no_edit=\n       shift\n       ;;\n@@ -346,7 +346,7 @@ do\n   --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\\\n   --reuse-message=*)\n       log_given=t$log_given\n-      use_commit=`expr \"$1\" : '-[^=]*=\\(.*\\)'`\n+      use_commit=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n       no_edit=t\n       shift\n       ;;\ndiff --git a/git-merge.sh b/git-merge.sh\nindex fc25f8d..24e3b50 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -103,7 +103,7 @@ do\n \t-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)\n \t\tcase \"$#,$1\" in\n \t\t*,*=*)\n-\t\t\tstrategy=`expr \"$1\" : '-[^=]*=\\(.*\\)'` ;;\n+\t\t\tstrategy=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'` ;;\n \t\t1,*)\n \t\t\tusage ;;\n \t\t*)\ndiff --git a/git-pull.sh b/git-pull.sh\nindex aa8c208..076785c 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -24,7 +24,7 @@ do\n \t-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)\n \t\tcase \"$#,$1\" in\n \t\t*,*=*)\n-\t\t\tstrategy=`expr \"$1\" : '-[^=]*=\\(.*\\)'` ;;\n+\t\t\tstrategy=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'` ;;\n \t\t1,*)\n \t\t\tusage ;;\n \t\t*)\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 12d9d0c..86b51ab 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -9,7 +9,7 @@ while case \"$#\" in 0) break;; esac\n do\n \tcase \"$1\" in\n \t--au=*|--aut=*|--auth=*|--autho=*|--author=*)\n-\t\tquilt_author=$(expr \"$1\" : '-[^=]*\\(.*\\)')\n+\t\tquilt_author=$(expr \"z$1\" : 'z-[^=]*\\(.*\\)')\n \t\tshift\n \t\t;;\n \n@@ -26,7 +26,7 @@ do\n \t\t;;\n \n \t--pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)\n-\t\tQUILT_PATCHES=$(expr \"$1\" : '-[^=]*\\(.*\\)')\n+\t\tQUILT_PATCHES=$(expr \"z$1\" : 'z-[^=]*\\(.*\\)')\n \t\tshift\n \t\t;;\n \ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 9ad1c44..0ac085e 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -179,7 +179,7 @@ do\n \t-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)\n \t\tcase \"$#,$1\" in\n \t\t*,*=*)\n-\t\t\tstrategy=`expr \"$1\" : '-[^=]*=\\(.*\\)'` ;;\n+\t\t\tstrategy=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'` ;;\n \t\t1,*)\n \t\t\tusage ;;\n \t\t*)\n-- \n1.4.1.rc1.ge6b53\n"}]}