summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorDennis Stosberg <dennis@stosberg.net>2006-06-27 16:54:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-27 17:56:05 (GMT)
commit8096fae7269e7b3882394100151bc017446b01a1 (patch)
tree6af8bf52f3ba424d52e3d3d2858e72a9790a38ca /git-pull.sh
parent1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (diff)
downloadgit-8096fae7269e7b3882394100151bc017446b01a1.zip
git-8096fae7269e7b3882394100151bc017446b01a1.tar.gz
git-8096fae7269e7b3882394100151bc017446b01a1.tar.bz2
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-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index aa8c208..076785c 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -24,7 +24,7 @@ do
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
case "$#,$1" in
*,*=*)
- strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
+ strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
1,*)
usage ;;
*)