From e9c8409900fc84cd7721117c98dfe01acd535aa2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 5 Jan 2007 01:25:18 -0800 Subject: 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 -- " to restore absense of the path in the index from the tree. Signed-off-by: Junio C Hamano --- diff.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index eff445596d..7a347cf77d 100644 --- a/diff.h +++ b/diff.h @@ -144,7 +144,9 @@ extern void diff_change(struct diff_options *, const char *base, const char *path); extern void diff_unmerge(struct diff_options *, - const char *path); + const char *path, + unsigned mode, + const unsigned char *sha1); extern int diff_scoreopt_parse(const char *opt); -- cgit v1.3