git-add: remove conflicting entry when adding.
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:09:41 +0000 (01:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:14:43 +0000 (01:14 -0800)
When replacing an existing file A with a directory A that has a
file A/B in it in the index, 'git add' did not succeed because
it forgot to pass the allow-replace flag to add_cache_entry().

It might be safer to leave this as an error and require the user
to explicitly remove the existing A first before adding A/B
since it is an unusual case, but doing that automatically is
much easier to use.

Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found