From: Junio C Hamano <junkio@cox.net>
Date: Tue, 14 Feb 2006 09:11:42 +0000 (-0800)
Subject: combine-diff: diff-files fix (#2)
X-Git-Tag: v1.2.1~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9ece7169a434d69a942b71dc49f507da37bbdbc3;p=git.git

combine-diff: diff-files fix (#2)

The raw format "git-diff-files -c" to show unmerged state forgot
to initialize the status fields from parents, causing NUL
characters to be emitted.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff-files.c b/diff-files.c
index 7db5ce64..0c3f8004 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -150,6 +150,8 @@ int main(int argc, const char **argv)
 					       nce->sha1, 20);
 					combine.p.parent[stage-2].mode =
 						DIFF_FILE_CANON_MODE(mode);
+					combine.p.parent[stage-2].status =
+						DIFF_STATUS_MODIFIED;
 				}
 
 				/* diff against the proper unmerged stage */