notes: extract enum notes_merge_strategy to notes-utils.h

A future patch will extract parsing of the --strategy string into a
helper function in notes.c and will require the enumeration definition.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/notes-merge.h b/notes-merge.h
index 1d01f6aacf54b27a498d6071b5ec80fee5c35a47..0d890563b5f427fe6924e34b3931ade51e00e18d 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -1,6 +1,8 @@
 #ifndef NOTES_MERGE_H
 #define NOTES_MERGE_H
 
 #ifndef NOTES_MERGE_H
 #define NOTES_MERGE_H
 

+#include "notes-utils.h"
+

 #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"
 
 enum notes_merge_verbosity {
 #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"
 
 enum notes_merge_verbosity {


@@ -13,13 +15,7 @@ struct notes_merge_options {
        const char *remote_ref;
        struct strbuf commit_msg;
        int verbosity;
        const char *remote_ref;
        struct strbuf commit_msg;
        int verbosity;

-       enum {
-               NOTES_MERGE_RESOLVE_MANUAL = 0,
-               NOTES_MERGE_RESOLVE_OURS,
-               NOTES_MERGE_RESOLVE_THEIRS,
-               NOTES_MERGE_RESOLVE_UNION,
-               NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
-       } strategy;
+       enum notes_merge_strategy strategy;

        unsigned has_worktree:1;
 };
 
        unsigned has_worktree:1;
 };
 

diff --git a/notes-utils.h b/notes-utils.h
index 890ddb33e13ad6b9d43887216acbe5430ed534cc..db5811e3f718e0dce7bc31e92cd05e481fe4376a 100644 (file)
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -19,6 +19,14 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
 
 void commit_notes(struct notes_tree *t, const char *msg);
 
 
 void commit_notes(struct notes_tree *t, const char *msg);
 

+enum notes_merge_strategy {
+               NOTES_MERGE_RESOLVE_MANUAL = 0,
+               NOTES_MERGE_RESOLVE_OURS,
+               NOTES_MERGE_RESOLVE_THEIRS,
+               NOTES_MERGE_RESOLVE_UNION,
+               NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
+};
+

 struct notes_rewrite_cfg {
        struct notes_tree **trees;
        const char *cmd;
 struct notes_rewrite_cfg {
        struct notes_tree **trees;
        const char *cmd;