diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 19:19:32 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 11:49:39 -0700 |
| commit | d0cfc3e866a77eed98ab2caf41a39a87837950e6 (patch) | |
| tree | 21a6cb067150bec1081c9ef3ac00504004f20707 /merge-recursive.c | |
| parent | a5400efe29fdaabbe5266d11d255b2ef5a4c3a66 (diff) | |
| download | git-d0cfc3e866a77eed98ab2caf41a39a87837950e6.tar.gz | |
cache-tree: mark istate->cache_changed on cache tree update
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 442c1ec0f4..0b5d34d0b2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -265,9 +265,7 @@ struct tree *write_tree_from_memory(struct merge_options *o) active_cache_tree = cache_tree(); if (!cache_tree_fully_valid(active_cache_tree) && - cache_tree_update(active_cache_tree, - (const struct cache_entry * const *)active_cache, - active_nr, 0) < 0) + cache_tree_update(&the_index, 0) < 0) die(_("error building trees")); result = lookup_tree(active_cache_tree->sha1); |