diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:13:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:13:44 -0700 |
| commit | b85997d14d1873a4baa3d04966cd5947e6134acd (patch) | |
| tree | b21c76c4bc0d3fbb4221283334065216e17beff1 /builtin-merge-recursive.c | |
| parent | b81a7b58875e07d7e82aafced1de9834ba1ef94a (diff) | |
| parent | 20a16eb33eee99fd3eab00c72f012b98d4eeee76 (diff) | |
| download | git-b85997d14d1873a4baa3d04966cd5947e6134acd.tar.gz git-b85997d14d1873a4baa3d04966cd5947e6134acd.tar.xz | |
Merge branch 'lt/unpack-trees'
* lt/unpack-trees:
unpack_trees(): fix diff-index regression.
traverse_trees_recursive(): propagate merge errors up
unpack_trees(): minor memory leak fix in unused destination index
Make 'unpack_trees()' have a separate source and destination index
Make 'unpack_trees()' take the index to work on as an argument
Add 'const' where appropriate to index handling functions
Fix tree-walking compare_entry() in the presense of --prefix
Move 'unpack_trees()' over to 'traverse_trees()' interface
Make 'traverse_trees()' traverse conflicting DF entries in parallel
Add return value to 'traverse_tree()' callback
Make 'traverse_tree()' use linked structure rather than 'const char *base'
Add 'df_name_compare()' helper function
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 5a0a7b529..5c7fbb259 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -213,6 +213,8 @@ static int git_merge_trees(int index_only, opts.merge = 1; opts.head_idx = 2; opts.fn = threeway_merge; + opts.src_index = &the_index; + opts.dst_index = &the_index; init_tree_desc_from_tree(t+0, common); init_tree_desc_from_tree(t+1, head); |