kernel/git - git - PowerEL Git System

17641 Commits

6 Branches

36 Tags

131 MiB

Tree: c6f5a7a916

Commit Graph

Author	SHA1	Message	Date
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>	17 years ago

Author

SHA1

Message

Date

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>

17 years ago

1 Commits (c6f5a7a916b36fc9dd00bb6dce3b68260579abe1)