diff options
| author | Dennis Stosberg <dennis@stosberg.net> | 2006-06-27 18:54:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-27 10:56:05 -0700 |
| commit | 8096fae7269e7b3882394100151bc017446b01a1 (patch) | |
| tree | 6af8bf52f3ba424d52e3d3d2858e72a9790a38ca /git-merge.sh | |
| parent | 1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (diff) | |
| download | git-8096fae7269e7b3882394100151bc017446b01a1.tar.gz git-8096fae7269e7b3882394100151bc017446b01a1.tar.xz | |
Fix expr usage for FreeBSD
Some implementations of "expr" (e.g. FreeBSD's) fail, if an
argument starts with a dash.
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index fc25f8dda..24e3b507e 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -103,7 +103,7 @@ do -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) case "$#,$1" in *,*=*) - strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; + strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; 1,*) usage ;; *) |