From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- rerere.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 rerere.h (limited to 'rerere.h') diff --git a/rerere.h b/rerere.h new file mode 100644 index 0000000..c32d79c --- /dev/null +++ b/rerere.h @@ -0,0 +1,46 @@ +#ifndef RERERE_H +#define RERERE_H + +#include "string-list.h" + +struct pathspec; +struct repository; + +#define RERERE_AUTOUPDATE 01 +#define RERERE_NOAUTOUPDATE 02 +#define RERERE_READONLY 04 + +/* + * Marks paths that have been hand-resolved and added to the + * index. Set in the util field of such paths after calling + * rerere_remaining. + */ +extern void *RERERE_RESOLVED; + +struct rerere_dir; +struct rerere_id { + struct rerere_dir *collection; + int variant; +}; + +int setup_rerere(struct repository *,struct string_list *, int); +#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS +#define rerere(flags) repo_rerere(the_repository, flags) +#endif +int repo_rerere(struct repository *, int); +/* + * Given the conflict ID and the name of a "file" used for replaying + * the recorded resolution (e.g. "preimage", "postimage"), return the + * path to that filesystem entity. With "file" specified with NULL, + * return the path to the directory that houses these files. + */ +const char *rerere_path(const struct rerere_id *, const char *file); +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 *); + +#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ + N_("update the index with reused conflict resolution if possible")) + +#endif -- cgit v1.2.3