From f88ed172e7a391bd907798ad2a3347a83cd24317 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 12 Sep 2005 22:20:42 -0700 Subject: [PATCH] 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 --- git-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-merge.sh b/git-merge.sh index a784e0f2cc..e51e73499a 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" -- 2.11.4.GIT