diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2011-12-06 18:43:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-06 14:57:36 -0800 |
| commit | 996277c520641d650dc15ad751cc4ad33318e298 (patch) | |
| tree | 53ba60089bcd1c336438f7ac7d5f2d124029fece /merge-recursive.c | |
| parent | 4eb0346fb8f8a59a1fb7a6bd01154655a7020087 (diff) | |
| download | git-996277c520641d650dc15ad751cc4ad33318e298.tar.gz | |
Refactor cache_tree_update idiom from commit
We'll need to safely create or update the cache-tree data of the_index
from other places. While at it, give it an argument that lets us
silence the messages produced by unmerged entries (which prevent it
from working).
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
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 cc664c39b6..e22a5195f6 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -265,7 +265,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) + active_cache, active_nr, 0, 0, 0) < 0) die("error building trees"); result = lookup_tree(active_cache_tree->sha1); |