merge-recursive: convert struct stage_data to use object_id

diff --git a/wt-status.c b/wt-status.c
index 4f27bd62af992122d83df911c42b585342ac1066..7c2fa8cdd7eefab58625d662f15716f0ff862dd8 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -432,7 +432,8 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
                        d->worktree_status = p->status;
                d->dirty_submodule = p->two->dirty_submodule;
                if (S_ISGITLINK(p->two->mode))
-                       d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
+                       d->new_submodule_commits = !!oidcmp(&p->one->oid,
+                                                           &p->two->oid);
        }
 }