diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-17 09:09:41 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-17 09:14:43 (GMT) |
commit | c33ab0dd100d91d417b5ed3378acbf3310c07cec (patch) | |
tree | 297253b1e7b6226f1eff5a8010f0fc7fc3f4094a /receive-pack.c | |
parent | 790fa0e297b41b9e8c98a77b58004c58408e5f7a (diff) | |
download | git-c33ab0dd100d91d417b5ed3378acbf3310c07cec.zip git-c33ab0dd100d91d417b5ed3378acbf3310c07cec.tar.gz git-c33ab0dd100d91d417b5ed3378acbf3310c07cec.tar.bz2 |
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>
Diffstat (limited to 'receive-pack.c')
0 files changed, 0 insertions, 0 deletions