Merge branch 'jk/ident-ai-canonname-could-be-null' into maint

diff --git a/patch-ids.h b/patch-ids.h
index eeb56b307f602773a41ea3b8cb22d89959c4f9d9..0f34ea11eadffea14620ea2ad45d69894469aef7 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -2,19 +2,18 @@
 #define PATCH_IDS_H
 
 struct patch_id {
-       unsigned char patch_id[20];
-       char seen;
+       struct hashmap_entry ent;
+       unsigned char patch_id[GIT_SHA1_RAWSZ];
+       struct commit *commit;
 };
 
 struct patch_ids {
+       struct hashmap patches;
        struct diff_options diffopts;
-       int nr, alloc;
-       struct patch_id **table;
-       struct patch_id_bucket *patches;
 };
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
-                   unsigned char *sha1);
+                   unsigned char *sha1, 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 *);