2 Commits

Author	SHA1	Message	Date
Justin Lebar	235e8d5914	code and test: fix misuses of "nor" ... Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-03-31 15:29:33 -07:00
Junio C Hamano	f5ed3b30e0	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>	2008-02-21 11:45:22 -08:00