cache-tree: update API to take abitrary flags
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
828ea97de4
commit
e859c69b26
@ -264,7 +264,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
|
||||
|
||||
if (!cache_tree_fully_valid(active_cache_tree) &&
|
||||
cache_tree_update(active_cache_tree,
|
||||
active_cache, active_nr, 0, 0, 0) < 0)
|
||||
active_cache, active_nr, 0) < 0)
|
||||
die("error building trees");
|
||||
|
||||
result = lookup_tree(active_cache_tree->sha1);
|
||||
|
Reference in New Issue
Block a user