From 9ece7169a434d69a942b71dc49f507da37bbdbc3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 14 Feb 2006 01:11:42 -0800 Subject: [PATCH 1/1] 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 --- diff-files.c | 2 ++ 1 file changed, 2 insertions(+) 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 */ -- 2.11.0