зеркало из https://github.com/microsoft/git.git
update-index: make D/F conflict error a bit more verbose.
When you remove a directory D that has a tracked file D/F out of the way to create a file D and try to "git update-index --add D", it used to say "cannot add" which was not very helpful. This issues an extra error message to explain the situation before the final "fatal" message. Since D/F conflicts are relatively rare event, extra verbosity would not make things too noisy. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
b1bfcae438
Коммит
790fa0e297
|
@ -609,7 +609,7 @@ int add_cache_entry(struct cache_entry *ce, int option)
|
|||
if (!skip_df_check &&
|
||||
check_file_directory_conflict(ce, pos, ok_to_replace)) {
|
||||
if (!ok_to_replace)
|
||||
return -1;
|
||||
return error("'%s' appears as both a file and as a directory", ce->name);
|
||||
pos = cache_name_pos(ce->name, ntohs(ce->ce_flags));
|
||||
pos = -pos-1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче