From: Junio C Hamano <junkio@cox.net>
Date: Sat, 7 May 2005 07:48:00 +0000 (-0700)
Subject: Fix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.
X-Git-Tag: v0.99~603^2~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33;p=git.git

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 13ec1c449..0849a3e68 100755
--- 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