Junio C Hamano 81a361be3b 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>

2006-12-17 01:14:44 -08:00

25 KiB

Raw Blame History

View Raw