rebase: fast-forward --onto in more cases

diff --git a/patch-ids.h b/patch-ids.h
index bec0f727a7bc4345e524ff04d9569c68fabd2209..03bb04e7071f5f65a3b09f138aa4473fa0a0a655 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -1,6 +1,13 @@
 #ifndef PATCH_IDS_H
 #define PATCH_IDS_H
 
+#include "diff.h"
+#include "hashmap.h"
+
+struct commit;
+struct object_id;
+struct repository;
+
 struct patch_id {
        struct hashmap_entry ent;
        struct object_id patch_id;
@@ -13,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 *);