From 2454c962fbe82f23aac4a5d78a0c3b5ffaed83a0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Feb 2006 12:53:07 -0800 Subject: combine-diff: show mode changes as well. Signed-off-by: Junio C Hamano --- diff.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index ff41c5859d..5c5e7fa91f 100644 --- a/diff.h +++ b/diff.h @@ -63,9 +63,16 @@ struct combine_diff_path { struct combine_diff_path *next; int len; char *path; + unsigned int mode; unsigned char sha1[20]; - unsigned char parent_sha1[FLEX_ARRAY][20]; + struct combine_diff_parent { + unsigned int mode; + unsigned char sha1[20]; + } parent[FLEX_ARRAY]; }; +#define combine_diff_path_size(n, l) \ + (sizeof(struct combine_diff_path) + \ + sizeof(struct combine_diff_parent) * (n) + (l) + 1) int show_combined_diff(struct combine_diff_path *elem, int num_parent, int dense, const char *header); -- cgit v1.3