admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-05-07 00:48:00 -07:00
parent ace1534d6f
commit e4f5b8c69d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-apply-patch-script
View File

@@ -8,7 +8,7 @@
# #
case "$#" in case "$#" in
2) 1)
echo >&2 "cannot handle unmerged diff on path $1." echo >&2 "cannot handle unmerged diff on path $1."
exit 1 ;; exit 1 ;;
esac esac