mirror of
https://github.com/git/git.git
synced 2024-05-13 12:16:10 +02:00
5b715ec48f
"git rerere" can encounter two or more files with the same conflict signature that have to be resolved in different ways, but there was no way to record these separate resolutions. * jc/rerere-multi: rerere: adjust 'forget' to multi-variant world order rerere: split code to call ll_merge() further rerere: move code related to "forget" together rerere: gc and clear rerere: do use multiple variants t4200: rerere a merge with two identical conflicts rerere: allow multiple variants to exist rerere: delay the recording of preimage rerere: handle leftover rr-cache/$ID directory and postimage files rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id rerere: split conflict ID further
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
#ifndef RERERE_H
|
|
#define RERERE_H
|
|
|
|
#include "string-list.h"
|
|
|
|
struct pathspec;
|
|
|
|
#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;
|
|
};
|
|
|
|
extern int setup_rerere(struct string_list *, int);
|
|
extern int rerere(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.
|
|
*/
|
|
extern const char *rerere_path(const struct rerere_id *, const char *file);
|
|
extern int rerere_forget(struct pathspec *);
|
|
extern int rerere_remaining(struct string_list *);
|
|
extern void rerere_clear(struct string_list *);
|
|
extern void rerere_gc(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
|