diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-17 10:09:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-17 10:14:43 +0100 |
| commit | c33ab0dd100d91d417b5ed3378acbf3310c07cec (patch) | |
| tree | 297253b1e7b6226f1eff5a8010f0fc7fc3f4094a /read-cache.c | |
| parent | update-index: make D/F conflict error a bit more verbose. (diff) | |
| download | git-c33ab0dd100d91d417b5ed3378acbf3310c07cec.tar.xz git-c33ab0dd100d91d417b5ed3378acbf3310c07cec.zip | |
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 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index a602010a69..983e68b892 100644 --- a/read-cache.c +++ b/read-cache.c @@ -358,7 +358,7 @@ int add_file_to_index(const char *path, int verbose) if (index_path(ce->sha1, path, &st, 1)) die("unable to index file %s", path); - if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD)) + if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE)) die("unable to add %s to index",path); if (verbose) printf("add '%s'\n", path); |