Merge branch 'jk/blame-first-parent'

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 12535c9b4f48cd196943c1914fefee7c47cecec2..8c6cb6cdc633db0a967feed1457c4aac60176088 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -103,8 +103,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
                        return 0;
                for (i = 0; i < merge_rr.nr; i++) {
                        const char *path = merge_rr.items[i].string;
-                       const char *name = (const char *)merge_rr.items[i].util;
-                       diff_two(rerere_path(name, "preimage"), path, path, path);
+                       const struct rerere_id *id = merge_rr.items[i].util;
+                       diff_two(rerere_path(id, "preimage"), path, path, path);
                }
        } else
                usage_with_options(rerere_usage, options);