Imported Upstream version 2.23.3

[platform/upstream/git.git] / notes-merge.h

diff --git a/notes-merge.h b/notes-merge.h
index f815f23..99f9c70 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -2,6 +2,11 @@
 #define NOTES_MERGE_H
 
 #include "notes-utils.h"
+#include "strbuf.h"
+
+struct commit;
+struct object_id;
+struct repository;
 
 #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"
 
@@ -11,6 +16,7 @@ enum notes_merge_verbosity {
 };
 
 struct notes_merge_options {
+       struct repository *repo;
        const char *local_ref;
        const char *remote_ref;
        struct strbuf commit_msg;
@@ -19,7 +25,8 @@ struct notes_merge_options {
        unsigned has_worktree:1;
 };
 
-void init_notes_merge_options(struct notes_merge_options *o);
+void init_notes_merge_options(struct repository *r,
+                             struct notes_merge_options *o);
 
 /*
  * Merge notes from o->remote_ref into o->local_ref