summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-06 20:53:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-06 21:06:49 (GMT)
commit2454c962fbe82f23aac4a5d78a0c3b5ffaed83a0 (patch)
tree2949196ba80a30573248981cc6d1d39879a2987f /diff.h
parent9843a1f6fdb31eed5db774a6d6f99ab0758642a3 (diff)
downloadgit-2454c962fbe82f23aac4a5d78a0c3b5ffaed83a0.zip
git-2454c962fbe82f23aac4a5d78a0c3b5ffaed83a0.tar.gz
git-2454c962fbe82f23aac4a5d78a0c3b5ffaed83a0.tar.bz2
combine-diff: show mode changes as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index ff41c58..5c5e7fa 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);