| commit | f5ed3b30e0091421408a0119fa75148955c4fc6a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Feb 2008 19:33:56 +0000 (21 11:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Feb 2008 19:45:22 +0000 (21 11:45 -0800) | ||
| tree | fe773298208212fefd640a5df44b51287cbdee41 | treesnapshot (tar.gz zip) |
| parent | 2cd5dfd240ecb63c77bcb2532664984e3b69ae47 | commitdiff |
git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
When invalidating unmerged entries in the index, we used to set
their ce_mode to 0 to note the fact that they do not matter
anymore which also made sure that later unpack_trees() call
would not reuse them. Instead just remove them from the index.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When invalidating unmerged entries in the index, we used to set
their ce_mode to 0 to note the fact that they do not matter
anymore which also made sure that later unpack_trees() call
would not reuse them. Instead just remove them from the index.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-read-tree.c | diffblobblamehistory | |
| t/t7104-reset.sh | [new file with mode: 0755] | blob |