diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
commite9c8409900fc84cd7721117c98dfe01acd535aa2
authorJunio C Hamano <junkio@cox.net>
Fri, 5 Jan 2007 09:25:18 +0000 (5 01:25 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Jan 2007 06:57:42 +0000 (6 22:57 -0800)
tree9904b7d43e86e423dbfc8454a5e7306c24d7cb73
parent13e86efbeae5994a85cc482b3964db7298c5c6ea
diff-index --cached --raw: show tree entry on the LHS for unmerged entries.

This updates the way diffcore represents an unmerged pair
somewhat.  It used to be that entries with mode=0 on both sides
were used to represent an unmerged pair, but now it has an
explicit flag.  This is to allow diff-index --cached to report
the entry from the tree when the path is unmerged in the index.

This is used in updating "git reset <tree> -- <path>" to restore
absense of the path in the index from the tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>
diff-lib.c
diff.c
diff.h
diffcore.h