From: Junio C Hamano <junkio@cox.net>
Date: Tue, 13 Sep 2005 05:20:42 +0000 (-0700)
Subject: Fix off-by-one error in git-merge
X-Git-Tag: v0.99.7~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f88ed172e7a391bd907798ad2a3347a83cd24317;p=git.git

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>
---

diff --git a/git-merge.sh b/git-merge.sh
index a784e0f2c..e51e73499 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"