diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-04 17:38:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 16:05:26 -0700 |
| commit | 1d51eced103f1c3e36beb6c1e01a413660910a50 (patch) | |
| tree | bc4a5916f96363e93874202a84e1f19e39f2de0b /builtin/prune.c | |
| parent | rerere: call conflict-ids IDs (diff) | |
| download | tgif-1d51eced103f1c3e36beb6c1e01a413660910a50.tar.xz | |
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 <preimage, postimage> for a given conflict ID.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/prune.c')
0 files changed, 0 insertions, 0 deletions