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>
Junio C Hamano committed
Feb 14, 2006 at 01:11 UTC
9ece7169a434d69a942b71dc49f507da37bbdbc3
1 file changed
+2
diff-files.c
+2
@@ -150,6 +150,8 @@ int main(int argc, const char **argv)
150
nce->sha1, 20);
151
combine.p.parent[stage-2].mode =
152
DIFF_FILE_CANON_MODE(mode);
153
+ combine.p.parent[stage-2].status =
154
+ DIFF_STATUS_MODIFIED;
155
}
156
157
/* diff against the proper unmerged stage */