diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-09 13:34:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-09 13:34:27 +0000 |
| commit | 4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f (patch) | |
| tree | 47c1d492e9c956c1cd2b74dbd3b9d8b0db44dc4e /rerere.h | |
| parent | Initial commit. (diff) | |
| download | git-4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f.tar.xz git-4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f.zip | |
Adding upstream version 1:2.43.0.upstream/1%2.43.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/rerere.h b/rerere.h new file mode 100644 index 0000000..5d6cb63 --- /dev/null +++ b/rerere.h @@ -0,0 +1,44 @@ +#ifndef RERERE_H +#define RERERE_H + +#include "gettext.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); +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 |