summaryrefslogtreecommitdiffstats
path: root/diff-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-07 09:48:00 +0200
committerJunio C Hamano <junkio@cox.net>2005-05-07 09:48:00 +0200
commite4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33 (patch)
tree609a94edaa42aeb4f8293f115a100b12c2e069b0 /diff-cache.c
parentIntroduce SHA1_FILE_DIRECTORIES to support multiple object databases. (diff)
downloadgit-e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33.tar.xz
git-e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33.zip
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 'diff-cache.c')
0 files changed, 0 insertions, 0 deletions