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>
Junio C Hamano committed
Dec 17, 2006 at 01:09 UTC
c33ab0dd100d91d417b5ed3378acbf3310c07cec
1 file changed
+1
-1
read-cache.c
+1
-1
@@ -358,7 +358,7 @@ int add_file_to_index(const char *path, int verbose)
358
359
if (index_path(ce->sha1, path, &st, 1))
360
die("unable to index file %s", path);
361
- if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD))
361
+ if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
362
die("unable to add %s to index",path);
363
if (verbose)
364
printf("add '%s'\n", path);