diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-09 13:40:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-09 13:40:32 -0700 |
| commit | 6d5c16a90ccf5724fb885d4b8af295c640da33a4 (patch) | |
| tree | df8b5876c2667924dbf78515091b2ec543ad597d /merge-recursive.c | |
| parent | 00fb2d25632191b89ac4144e1a6498470a4a1c9e (diff) | |
| parent | 4cd675565647b2ccacdd6c93841b4ff06c32b16a (diff) | |
Merge branch 'tr/cache-tree' into maint-1.7.8
* tr/cache-tree:
t0090: be prepared that 'wc -l' writes leading blanks
reset: update cache-tree data when appropriate
commit: write cache-tree data when writing index anyway
Refactor cache_tree_update idiom from commit
Test the current state of the cache-tree optimization
Add test-scrap-cache-tree
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); |