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 --- builtin/rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin') diff --git a/builtin/rerere.c b/builtin/rerere.c index 81730bb5e6..fd229a7c7d 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -103,7 +103,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) } else if (!strcmp(argv[0], "diff")) for (i = 0; i < merge_rr.nr; i++) { const char *path = merge_rr.items[i].string; - const char *id = (const char *)merge_rr.items[i].util; + const struct rerere_id *id = merge_rr.items[i].util; diff_two(rerere_path(id, "preimage"), path, path, path); } else -- cgit v1.2.3