X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=8fac465a9df9b1d8789d17f008968295baa27ad1;hb=6c2711e70cc070559537a44f4975add451ee53f2;hp=946a4067cc4c56cb5d4b79ff13e9aecb4d99b336;hpb=94c6eb3e88a3f220ffad513e54abbb599cedab6c;p=git.git

diff --git a/diff.h b/diff.h
index 946a4067..8fac465a 100644
--- a/diff.h
+++ b/diff.h
@@ -66,6 +66,7 @@ struct combine_diff_path {
 	unsigned int mode;
 	unsigned char sha1[20];
 	struct combine_diff_parent {
+		char status;
 		unsigned int mode;
 		unsigned char sha1[20];
 	} parent[FLEX_ARRAY];