Merge branch 'tg/range-diff-corner-case-fix' into maint

diff --git a/patch-ids.h b/patch-ids.h
index 0f34ea11eadffea14620ea2ad45d69894469aef7..79ac9a8498383b971107f4b30a7a75dbd30613d1 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -1,9 +1,15 @@
 #ifndef PATCH_IDS_H
 #define PATCH_IDS_H
 
+#include "diff.h"
+#include "hashmap.h"
+
+struct commit;
+struct object_id;
+
 struct patch_id {
        struct hashmap_entry ent;
-       unsigned char patch_id[GIT_SHA1_RAWSZ];
+       struct object_id patch_id;
        struct commit *commit;
 };
 
@@ -13,7 +19,7 @@ struct patch_ids {
 };
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
-                   unsigned char *sha1, int);
+                   struct object_id *oid, int);
 int init_patch_ids(struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);