diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-01-16 03:36:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-08 01:35:43 +0100 |
| commit | e859c69b26528a55bd64f4eee2ed06fad999d862 (patch) | |
| tree | d2509c83b038e0e7233e3ee0cc01a17c7e7c7258 /merge-recursive.c | |
| parent | Git 1.7.9 (diff) | |
| download | git-e859c69b26528a55bd64f4eee2ed06fad999d862.tar.xz git-e859c69b26528a55bd64f4eee2ed06fad999d862.zip | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d83cd6c662..6479a60cd1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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); |