Staging
v0.5.1
https://github.com/git/git
Revision 76b54ee9b9944ee70422ac24884f78769cf264f1 authored by Jonathan Nieder on 19 April 2020, 23:26:41 UTC, committed by Jonathan Nieder on 19 April 2020, 23:26:41 UTC
This merges up the security fix from v2.17.5.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
2 parent s a5979d7 + ba6f090
Raw File
Tip revision: 76b54ee9b9944ee70422ac24884f78769cf264f1 authored by Jonathan Nieder on 19 April 2020, 23:26:41 UTC
Git 2.19.5
Tip revision: 76b54ee
rerere.h
#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;
};

int setup_rerere(struct string_list *, int);
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.
 */
const char *rerere_path(const struct rerere_id *, const char *file);
int rerere_forget(struct pathspec *);
int rerere_remaining(struct string_list *);
void rerere_clear(struct string_list *);
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
back to top