| commit | 81a361be3b12f393d402c5da63191c11c18ea6a9 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 17 Dec 2006 01:39:06 +0000 (16 17:39 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 17 Dec 2006 09:14:44 +0000 (17 01:14 -0800) | ||
| tree | 5f0b4d5c59c5e3aab6820c516628c51b86e1fe4a | treesnapshot (tar.gz zip) |
| parent | c33ab0dd100d91d417b5ed3378acbf3310c07cec | commitdiff |
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>
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>
| read-cache.c | diffblobblamehistory | |
| t/t0000-basic.sh | diffblobblamehistory |