summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2015-03-13 23:39:33 +0000
committerJunio C Hamano <gitster@pobox.com>2015-03-13 22:43:13 -0700
commit1ff57c13c54bc9d548178e012f77717f87f2655d (patch)
tree60fc80edc5fe63b258d0da5c74a17eb1bdb8826a /diff.h
parentfa33c3aae238c683b2b15989b9d7f88df19fa93d (diff)
downloadgit-1ff57c13c54bc9d548178e012f77717f87f2655d.tar.gz
diff: convert struct combine_diff_path to object_id
Also, convert a constant to GIT_SHA1_HEXSZ. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index b4a624d235..f6fdf49e14 100644
--- a/diff.h
+++ b/diff.h
@@ -6,6 +6,7 @@
#include "tree-walk.h"
#include "pathspec.h"
+#include "object.h"
struct rev_info;
struct diff_options;
@@ -207,11 +208,11 @@ struct combine_diff_path {
struct combine_diff_path *next;
char *path;
unsigned int mode;
- unsigned char sha1[20];
+ struct object_id oid;
struct combine_diff_parent {
char status;
unsigned int mode;
- unsigned char sha1[20];
+ struct object_id oid;
} parent[FLEX_ARRAY];
};
#define combine_diff_path_size(n, l) \