From 18bb99342fdb4b612ae45be3fef084ceebd498a0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Jul 2015 14:45:55 -0700 Subject: rerere: call conflict-ids IDs Most places we call conflict IDs "name" and some others we call them "hex"; update all of them to "id". Signed-off-by: Junio C Hamano --- rerere.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rerere.h') diff --git a/rerere.h b/rerere.h index 2956c2edf2..f998ebae6e 100644 --- a/rerere.h +++ b/rerere.h @@ -17,7 +17,7 @@ extern void *RERERE_RESOLVED; extern int setup_rerere(struct string_list *, int); extern int rerere(int); -extern const char *rerere_path(const char *hex, const char *file); +extern const char *rerere_path(const char *id, const char *file); extern int rerere_forget(struct pathspec *); extern int rerere_remaining(struct string_list *); extern void rerere_clear(struct string_list *); -- cgit v1.2.3 From 1d51eced103f1c3e36beb6c1e01a413660910a50 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 4 Jul 2015 17:38:34 -0700 Subject: rerere: use "struct rerere_id" instead of "char *" for conflict ID This gives a thin abstraction between the conflict ID that is a hash value obtained by inspecting the conflicts and the name of the directory under $GIT_DIR/rr-cache/, in which the previous resolution is recorded to be replayed. The plan is to make sure that the presence of the directory does not imply the presense of a previous resolution and vice-versa, and later allow us to have more than one pair of for a given conflict ID. Signed-off-by: Junio C Hamano --- rerere.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'rerere.h') diff --git a/rerere.h b/rerere.h index f998ebae6e..ce545d0c04 100644 --- a/rerere.h +++ b/rerere.h @@ -15,9 +15,19 @@ struct pathspec; */ extern void *RERERE_RESOLVED; +struct rerere_id { + char hex[41]; +}; + extern int setup_rerere(struct string_list *, int); extern int rerere(int); -extern const char *rerere_path(const char *id, const char *file); +/* + * 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 *); -- cgit v1.2.3