diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 07:08:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 11:21:11 +0200 |
| commit | 26da1d78674204c482ec90905dd4de3f6bcd3c5f (patch) | |
| tree | 3c565041ba6e432ff9064a1d8302f49ef33c2605 /wt-status.h | |
| parent | diff-index: report unmerged new entries (diff) | |
| download | git-26da1d78674204c482ec90905dd4de3f6bcd3c5f.tar.xz git-26da1d78674204c482ec90905dd4de3f6bcd3c5f.zip | |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions