mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
![Junio C Hamano](/assets/img/avatar_default.png)
Code clean-up and minor fixes. * jc/rerere: (21 commits) rerere: un-nest merge() further rerere: use "struct rerere_id" instead of "char *" for conflict ID rerere: call conflict-ids IDs rerere: further clarify do_rerere_one_path() rerere: further de-dent do_plain_rerere() rerere: refactor "replay" part of do_plain_rerere() rerere: explain the remainder rerere: explain "rerere forget" codepath rerere: explain the primary codepath rerere: explain MERGE_RR management helpers rerere: fix benign off-by-one non-bug and clarify code rerere: explain the rerere I/O abstraction rerere: do not leak mmfile[] for a path with multiple stage #1 entries rerere: stop looping unnecessarily rerere: drop want_sp parameter from is_cmarker() rerere: report autoupdated paths only after actually updating them rerere: write out each record of MERGE_RR in one go rerere: lift PATH_MAX limitation rerere: plug conflict ID leaks rerere: handle conflicts with multiple stage #1 entries ...
41 lines
1.1 KiB
C
41 lines
1.1 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_id {
|
|
char hex[41];
|
|
};
|
|
|
|
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
|