mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
diff-index: keep the original index intact
When comparing the index and a tree, we used to read the contents of the
tree into stage #1 of the index and compared them with stage #0. In order
not to lose sight of entries originally unmerged in the index, we hoisted
them to stage #3 before reading the tree.
Commit d1f2d7e
(Make run_diff_index() use unpack_trees(), not read_tree(),
2008-01-19) changed all this. These days, we instead use unpack_trees()
API to traverse the tree and compare the contents with the index, without
modifying the index at all. There is no reason to hoist the unmerged
entries to stage #3 anymore.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
29796c6ccf
commit
26da1d7867
18
diff-lib.c
18
diff-lib.c
|
@ -308,22 +308,6 @@ static int show_modified(struct rev_info *revs,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* This turns all merge entries into "stage 3". That guarantees that
|
|
||||||
* when we read in the new tree (into "stage 1"), we won't lose sight
|
|
||||||
* of the fact that we had unmerged entries.
|
|
||||||
*/
|
|
||||||
static void mark_merge_entries(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < active_nr; i++) {
|
|
||||||
struct cache_entry *ce = active_cache[i];
|
|
||||||
if (!ce_stage(ce))
|
|
||||||
continue;
|
|
||||||
ce->ce_flags |= CE_STAGEMASK;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This gets a mix of an existing index and a tree, one pathname entry
|
* This gets a mix of an existing index and a tree, one pathname entry
|
||||||
* at a time. The index entry may be a single stage-0 one, but it could
|
* at a time. The index entry may be a single stage-0 one, but it could
|
||||||
|
@ -435,8 +419,6 @@ int run_diff_index(struct rev_info *revs, int cached)
|
||||||
struct unpack_trees_options opts;
|
struct unpack_trees_options opts;
|
||||||
struct tree_desc t;
|
struct tree_desc t;
|
||||||
|
|
||||||
mark_merge_entries();
|
|
||||||
|
|
||||||
ent = revs->pending.objects[0].item;
|
ent = revs->pending.objects[0].item;
|
||||||
tree_name = revs->pending.objects[0].name;
|
tree_name = revs->pending.objects[0].name;
|
||||||
tree = parse_tree_indirect(ent->sha1);
|
tree = parse_tree_indirect(ent->sha1);
|
||||||
|
|
Loading…
Reference in a new issue