rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/reflog-walk.c b/reflog-walk.c
index 842b2f77dc3e40a2eb296bfade00d9d2104ff9e1..5008bbf6ada3707009722e3a3ca5b37437fbfb24 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -161,7 +161,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
                        struct object_id oid;
                        char *b;
                        int ret = dwim_log(branch, strlen(branch),
-                                          oid.hash, &b);
+                                          &oid, &b);
                        if (ret > 1)
                                free(b);
                        else if (ret == 1) {