diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-06 12:26:14 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-03-09 00:43:48 -0800 |
commit | bc052d7f435f8f729127cc4790484865c1a974b9 (patch) | |
tree | 5b685a66e43a9d1ae9743c2b939b09b1eb9805af /builtin-commit.c | |
parent | d1f128b0509dce8b492c233b36131f096fd71274 (diff) | |
download | git-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-commit.c')
-rw-r--r-- | builtin-commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index f49c22e642..38a542258a 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -198,6 +198,7 @@ static void create_base_index(void) opts.head_idx = 1; opts.index_only = 1; opts.merge = 1; + opts.index = &the_index; opts.fn = oneway_merge; tree = parse_tree_indirect(head_sha1); |