From fed3fef451a45c0b654f996760f403b454f23616 Mon Sep 17 00:00:00 2001 From: Peter Pettersson Date: Mon, 7 Feb 2022 00:45:44 +0100 Subject: merge: allocate merge flags for internal use Allocate flags in git_merge_flag_t and git_merge_file_flag_t for internal usage to prevent accidental double allocation. --- include/git2/merge.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/git2/merge.h b/include/git2/merge.h index edd090cff..a30833915 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -91,7 +91,10 @@ typedef enum { * instead simply use the first base. This flag provides a similar * merge base to `git-merge-resolve`. */ - GIT_MERGE_NO_RECURSIVE = (1 << 3) + GIT_MERGE_NO_RECURSIVE = (1 << 3), + + /* This flag is reserved for internal library use */ + GIT_MERGE__INTERNAL_FLAG = (1 << 30) } git_merge_flag_t; /** @@ -162,7 +165,10 @@ typedef enum { GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), /** Create zdiff3 ("zealous diff3")-style files */ - GIT_MERGE_FILE_STYLE_ZDIFF3 = (1 << 8) + GIT_MERGE_FILE_STYLE_ZDIFF3 = (1 << 8), + + /* This flag is reserved for internal library use */ + GIT_MERGE_FILE__INTERNAL_FLAG = (1 << 30) } git_merge_file_flag_t; #define GIT_MERGE_CONFLICT_MARKER_SIZE 7 -- cgit v1.2.1