summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-13 05:20:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-13 05:52:52 (GMT)
commitf88ed172e7a391bd907798ad2a3347a83cd24317 (patch)
tree6b044bd249b4b07e695dfb06eca3fea9d25b8458 /git-merge.sh
parent22c67ca88ec65c4f278e8c82b2d98f3bd025238b (diff)
downloadgit-f88ed172e7a391bd907798ad2a3347a83cd24317.zip
git-f88ed172e7a391bd907798ad2a3347a83cd24317.tar.gz
git-f88ed172e7a391bd907798ad2a3347a83cd24317.tar.bz2
Fix off-by-one error in git-merge
'git-merge -s' without a strategy name does not fail and does not give usage as it should. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index a784e0f..e51e734 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -43,7 +43,7 @@ do
case "$#,$1" in
*,*=*)
strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
- 0,*)
+ 1,*)
usage ;;
*)
strategy="$2"