summaryrefslogtreecommitdiff
path: root/git-apply-patch-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-07 07:48:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-05-07 07:48:00 (GMT)
commite4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33 (patch)
tree609a94edaa42aeb4f8293f115a100b12c2e069b0 /git-apply-patch-script
parentace1534d6f3a710ed82e7e27ba1fe77c0c278695 (diff)
downloadgit-e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33.zip
git-e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33.tar.gz
git-e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33.tar.bz2
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>
Diffstat (limited to 'git-apply-patch-script')
-rwxr-xr-xgit-apply-patch-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-apply-patch-script b/git-apply-patch-script
index 13ec1c4..0849a3e 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