rerere: use "struct rerere_id" instead of "char *" for conflict ID
authorJunio C Hamano <gitster@pobox.com>
Sun, 5 Jul 2015 00:38:34 +0000 (17:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 23:05:26 +0000 (16:05 -0700)
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 <preimage, postimage> for a given conflict ID.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found