summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-17 01:39:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-17 09:14:44 (GMT)
commit81a361be3b12f393d402c5da63191c11c18ea6a9 (patch)
tree5f0b4d5c59c5e3aab6820c516628c51b86e1fe4a /receive-pack.c
parentc33ab0dd100d91d417b5ed3378acbf3310c07cec (diff)
downloadgit-81a361be3b12f393d402c5da63191c11c18ea6a9.zip
git-81a361be3b12f393d402c5da63191c11c18ea6a9.tar.gz
git-81a361be3b12f393d402c5da63191c11c18ea6a9.tar.bz2
Fix check_file_directory_conflict().
When replacing an existing file A with a directory A that has a file A/B in it in the index, 'update-index --replace --add A/B' did not properly remove the file to make room for the new directory. There was a trivial logic error, most likely a cut & paste one, dating back to quite early days of git. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'receive-pack.c')
0 files changed, 0 insertions, 0 deletions