Extend interface of add_files_to_cache to allow ignore indexing errors
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
960b8ad1b1
commit
7ae02a30e8
@ -282,7 +282,7 @@ static int merge_working_tree(struct checkout_opts *opts,
|
||||
* entries in the index.
|
||||
*/
|
||||
|
||||
add_files_to_cache(0, NULL, NULL);
|
||||
add_files_to_cache(NULL, NULL, 0);
|
||||
work = write_tree_from_memory();
|
||||
|
||||
ret = reset_to_new(new->commit->tree, opts->quiet);
|
||||
|
Reference in New Issue
Block a user