projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTTP slot reuse fixes
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
ff41c58
..
8fac465
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-63,14
+63,23
@@
struct combine_diff_path {
struct combine_diff_path *next;
int len;
char *path;
struct combine_diff_path *next;
int len;
char *path;
+ unsigned int mode;
unsigned char sha1[20];
unsigned char sha1[20];
- unsigned char parent_sha1[FLEX_ARRAY][20];
+ struct combine_diff_parent {
+ char status;
+ 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);
+extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+ int dense, const char *header,
+ struct diff_options *);
-extern
int diff_tree_combined_merge(const unsigned char *sha1, const char *, in
t);
+extern
const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *op
t);
extern void diff_addremove(struct diff_options *,
int addremove,
extern void diff_addremove(struct diff_options *,
int addremove,