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/rerere.c | |
| parent | 18bb99342fdb4b612ae45be3fef084ceebd498a0 (diff) | |
| download | git-1d51eced103f1c3e36beb6c1e01a413660910a50.tar.gz git-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/rerere.c')
| -rw-r--r-- | builtin/rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index 81730bb5e..fd229a7c7 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 |