Merge branch 'ab/test-env'

diff --git a/patch-ids.h b/patch-ids.h
index 79ac9a8498383b971107f4b30a7a75dbd30613d1..03bb04e7071f5f65a3b09f138aa4473fa0a0a655 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -6,6 +6,7 @@
 
 struct commit;
 struct object_id;
+struct repository;
 
 struct patch_id {
        struct hashmap_entry ent;
@@ -19,8 +20,8 @@ struct patch_ids {
 };
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
-                   struct object_id *oid, int);
-int init_patch_ids(struct patch_ids *);
+                   struct object_id *oid, int, int);
+int init_patch_ids(struct repository *, struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
 struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);