| commit | c33ab0dd100d91d417b5ed3378acbf3310c07cec | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 17 Dec 2006 09:09:41 +0000 (17 01:09 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 17 Dec 2006 09:14:43 +0000 (17 01:14 -0800) | ||
| tree | 297253b1e7b6226f1eff5a8010f0fc7fc3f4094a | treesnapshot (tar.gz zip) |
| parent | 790fa0e297b41b9e8c98a77b58004c58408e5f7a | commitdiff |
git-add: remove conflicting entry when adding.
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>
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>
| read-cache.c | diffblobblamehistory |