merge-recursive: convert struct stage_data to use object_id

diff --git a/wt-status.c b/wt-status.c
index ce5080c1a2ca18095534ec4b0e71019300a4b605..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);
        }
 }
 
@@ -951,6 +952,7 @@ static void show_merge_in_progress(struct wt_status *s,
                        status_printf_ln(s, color,
                                _("  (fix conflicts and run \"git commit\")"));
        } else {
+               s-> commitable = 1;
                status_printf_ln(s, color,
                        _("All conflicts fixed but you are still merging."));
                if (s->hints)
@@ -1296,11 +1298,6 @@ static char *get_branch(const struct worktree *wt, const char *path)
        return NULL;
 }
 
-static char *read_and_strip_branch(const char *path)
-{
-       return get_branch(NULL, path);
-}
-
 struct grab_1st_switch_cbdata {
        struct strbuf buf;
        unsigned char nsha1[20];
@@ -1393,6 +1390,19 @@ int wt_status_check_rebase(const struct worktree *wt,
        return 1;
 }
 
+int wt_status_check_bisect(const struct worktree *wt,
+                          struct wt_status_state *state)
+{
+       struct stat st;
+
+       if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
+               state->bisect_in_progress = 1;
+               state->branch = get_branch(wt, "BISECT_START");
+               return 1;
+       }
+       return 0;
+}
+
 void wt_status_get_state(struct wt_status_state *state,
                         int get_detached_from)
 {
@@ -1408,10 +1418,7 @@ void wt_status_get_state(struct wt_status_state *state,
                state->cherry_pick_in_progress = 1;
                hashcpy(state->cherry_pick_head_sha1, sha1);
        }
-       if (!stat(git_path("BISECT_LOG"), &st)) {
-               state->bisect_in_progress = 1;
-               state->branch = read_and_strip_branch("BISECT_START");
-       }
+       wt_status_check_bisect(NULL, state);
        if (!stat(git_path_revert_head(), &st) &&
            !get_sha1("REVERT_HEAD", sha1)) {
                state->revert_in_progress = 1;