Fix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.

An unmerged path is given as the sole parameter to the script, so it
should check against $# being 1, not 2.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-apply-patch-script b/git-apply-patch-script
index 13ec1c4490612f524f9b1070a57229cdc2c50aed..0849a3e68b3a219aa41e3357fd71fb39b285e059 100755 (executable)
--- a/git-apply-patch-script
+++ b/git-apply-patch-script
@@ -8,7 +8,7 @@
 #
 
 case "$#" in
-2)
+1)
     echo >&2 "cannot handle unmerged diff on path $1."
     exit 1 ;;
 esac