summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-06 12:26:14 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-09 00:43:48 -0800
commitbc052d7f435f8f729127cc4790484865c1a974b9 (patch)
tree5b685a66e43a9d1ae9743c2b939b09b1eb9805af /builtin-merge-recursive.c
parentd1f128b0509dce8b492c233b36131f096fd71274 (diff)
downloadgit-bc052d7f435f8f729127cc4790484865c1a974b9.tar.gz
Make 'unpack_trees()' take the index to work on as an argument
This is just a very mechanical conversion, and makes everybody set it to '&the_index' before calling, but at least it makes it more explicit where we work with the index. The next stage would be to split that index usage up into a 'source' and a 'destination' index, so that we can unpack into a different index than we started out from. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
-rw-r--r--builtin-merge-recursive.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 6fe4102c0c..50b389623c 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -213,6 +213,7 @@ static int git_merge_trees(int index_only,
opts.merge = 1;
opts.head_idx = 2;
opts.fn = threeway_merge;
+ opts.index = &the_index;
init_tree_desc_from_tree(t+0, common);
init_tree_desc_from_tree(t+1, head);