[PATCH v8 2/8] notes: extract enum notes_merge_strategy to notes-utils.h
- From
Jacob Keller <jacob.e.keller@intel.com>
- Date
- Aug 17, 2015, 08:46 UTC
- Message-ID
- <1439801191-3026-3-git-send-email-jacob.e.keller@intel.com>
- In-Reply-To
- <1439801191-3026-1-git-send-email-jacob.e.keller@intel.com>
From: Jacob Keller <jacob.keller@gmail.com>
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> --- notes-merge.h | 10 +++------- notes-utils.h | 8 ++++++++ 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/notes-merge.h b/notes-merge.h index 1d01f6aacf54..0d890563b5f4 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -1,6 +1,8 @@ #ifndef NOTES_MERGE_H #define NOTES_MERGE_H +#include "notes-utils.h" + #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; - 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; }; diff --git a/notes-utils.h b/notes-utils.h index 890ddb33e13a..db5811e3f718 100644 --- 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); +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;
-- 2.5.0.280.g4aaba03