combine-diff: show mode changes as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-02-06 12:53:07 -08:00
parent 9843a1f6fd
commit 2454c962fb
3 changed files with 48 additions and 15 deletions

9
diff.h
View File

@ -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);