From: Patrick Steinhardt Date: Thu, 29 Oct 2026 09:57:11 GMT Subject: [PATCH v2 02/12] rerere: convert flags into an enum Message-ID: <20261029-pks-rerere-subcommands-v2-2-07d5ba18e882@pks.im> In-Reply-To: <20261029-pks-rerere-subcommands-v2-0-07d5ba18e882@pks.im> Our modern coding guidelines say that flags should typically be passed around as enums so that it becomes trivial to see what kind of flags are expected. Adapt the rerere flags accordingly and document them. Signed-off-by: Patrick Steinhardt --- rerere.c | 7 ++++--- rerere.h | 30 +++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/rerere.c b/rerere.c index 47a4a325bf5..3652b7ac2d5 100644 --- a/rerere.c +++ b/rerere.c @@ -908,7 +908,7 @@ static int is_rerere_enabled(struct repository *r) int rerere_cache_setup(struct rerere_cache *cache, struct repository *r, struct string_list *merge_rr, - int flags) + enum rerere_flags flags) { int lock_timeout_ms = 1000; int fd; @@ -951,7 +951,7 @@ int rerere_cache_setup(struct rerere_cache *cache, return fd; } -int rerere(struct repository *r, int flags) +int rerere(struct repository *r, enum rerere_flags flags) { struct string_list merge_rr = STRING_LIST_INIT_DUP; struct rerere_cache cache; @@ -1336,7 +1336,8 @@ bool rerere_gc_needed(struct repository *r, size_t limit) return needed; } -void rerere_gc(struct repository *r, struct string_list *rr, int flags) +void rerere_gc(struct repository *r, struct string_list *rr, + enum rerere_flags flags) { struct rerere_cache cache; struct string_list to_remove = STRING_LIST_INIT_DUP; diff --git a/rerere.h b/rerere.h index dd9da03d6db..f13790c5dcd 100644 --- a/rerere.h +++ b/rerere.h @@ -9,12 +9,6 @@ struct pathspec; struct repository; -#define RERERE_AUTOUPDATE 01 -#define RERERE_NOAUTOUPDATE 02 -#define RERERE_READONLY 04 -/* If MERGE_RR.lock is taken, return -1 as if rerere were disabled */ -#define RERERE_NOWAIT 010 - /* * Marks paths that have been hand-resolved and added to the * index. Set in the util field of such paths after calling @@ -39,10 +33,27 @@ struct rerere_id { int variant; }; +enum rerere_flags { + /* + * Auto-update the index with previously recorded resolutions. This can + * be used to explicitly override "rerere.autoUpdate". + */ + RERERE_AUTOUPDATE = (1 << 0), + + /* Reverse of RERERE_AUTOUPDATE. */ + RERERE_NOAUTOUPDATE = (1 << 1), + + /* Skip acquiring the MERGE_RR.lock for a read-only operation. */ + RERERE_READONLY = (1 << 2), + + /* If MERGE_RR.lock is taken, return -1 as if rerere were disabled. */ + RERERE_NOWAIT = (1 << 3), +}; + int rerere_cache_setup(struct rerere_cache *cache, struct repository *r, struct string_list *merge_rr, - int flags); + enum rerere_flags flags); void rerere_cache_release(struct rerere_cache *cache); /* @@ -51,7 +62,7 @@ void rerere_cache_release(struct rerere_cache *cache); * and working tree files. It records (and optionally updates) resolved * conflicts and reuses recorded resolutions for unresolved conflicts. */ -int rerere(struct repository *r, int flags); +int rerere(struct repository *r, enum rerere_flags flags); /* * Given the conflict ID and the name of a "file" used for replaying @@ -65,7 +76,8 @@ const char *rerere_path(struct repository *, int rerere_forget(struct repository *, struct pathspec *); int rerere_remaining(struct repository *, struct string_list *); void rerere_clear(struct repository *, struct string_list *); -void rerere_gc(struct repository *, struct string_list *, int); +void rerere_gc(struct repository *, struct string_list *, + enum rerere_flags flags); /* * Check whether garbage collection for rerere entries is needed, which is -- 2.56.0.341.g393f52fd96.dirty