From e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 7 May 2005 00:48:00 -0700 Subject: [PATCH] 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 --- git-apply-patch-script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-apply-patch-script b/git-apply-patch-script index 13ec1c44..0849a3e6 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 -- 2.11.0