Skip to content

Commit dc5400e

Browse files
gitstergitster
committed
Merge branch 'jc/rerere'
Code clean-up and minor fixes. * jc/rerere: (21 commits) rerere: un-nest merge() further rerere: use "struct rerere_id" instead of "char *" for conflict ID rerere: call conflict-ids IDs rerere: further clarify do_rerere_one_path() rerere: further de-dent do_plain_rerere() rerere: refactor "replay" part of do_plain_rerere() rerere: explain the remainder rerere: explain "rerere forget" codepath rerere: explain the primary codepath rerere: explain MERGE_RR management helpers rerere: fix benign off-by-one non-bug and clarify code rerere: explain the rerere I/O abstraction rerere: do not leak mmfile[] for a path with multiple stage #1 entries rerere: stop looping unnecessarily rerere: drop want_sp parameter from is_cmarker() rerere: report autoupdated paths only after actually updating them rerere: write out each record of MERGE_RR in one go rerere: lift PATH_MAX limitation rerere: plug conflict ID leaks rerere: handle conflicts with multiple stage #1 entries ...
2 parents 9958dd8 + 15ed07d commit dc5400e

File tree

3 files changed

+417
-154
lines changed

3 files changed

+417
-154
lines changed

‎builtin/rerere.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
103103
return 0;
104104
for (i = 0; i < merge_rr.nr; i++) {
105105
const char *path = merge_rr.items[i].string;
106-
const char *name = (const char *)merge_rr.items[i].util;
107-
diff_two(rerere_path(name, "preimage"), path, path, path);
106+
const struct rerere_id *id = merge_rr.items[i].util;
107+
diff_two(rerere_path(id, "preimage"), path, path, path);
108108
}
109109
} else
110110
usage_with_options(rerere_usage, options);

0 commit comments

Comments
 (0)