diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-07 02:12:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-09 09:03:38 (GMT) |
| commit | 34110cd4e394e3f92c01a4709689b384c34645d8 (patch) | |
| tree | b98563eacd52df16ad3efec092ef8160b7873521 /builtin-commit.c | |
| parent | bc052d7f435f8f729127cc4790484865c1a974b9 (diff) | |
| download | git-34110cd4e394e3f92c01a4709689b384c34645d8.zip git-34110cd4e394e3f92c01a4709689b384c34645d8.tar.gz git-34110cd4e394e3f92c01a4709689b384c34645d8.tar.bz2 | |
Make 'unpack_trees()' have a separate source and destination index
We will always unpack into our own internal index, but we will take the
source from wherever specified, and we will optionally write the result
to a specified index (optionally, because not everybody even _wants_ any
result: the index diffing really wants to just walk the tree and index
in parallel).
This ends up removing a fair number more lines than it adds, for the
simple reason that we can now skip all the crud that tried to be
oh-so-careful about maintaining our position in the index as we were
traversing and modifying it. Since we don't actually modify the source
index any more, we can just update the 'o->pos' pointer without worrying
about whether an index entry got removed or replaced or added to.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 38a5422..660a345 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -198,7 +198,8 @@ static void create_base_index(void) opts.head_idx = 1; opts.index_only = 1; opts.merge = 1; - opts.index = &the_index; + opts.src_index = &the_index; + opts.dst_index = &the_index; opts.fn = oneway_merge; tree = parse_tree_indirect(head_sha1); |