Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix'

[thirdparty/git.git] / worktree.c

diff --git a/worktree.c b/worktree.c
index 5d5dd466096de172f783cc0cf18daaadae6703c2..b02a05a74a341157fa8dff7da22936127bebf18e 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -415,9 +415,9 @@ int is_worktree_being_bisected(const struct worktree *wt,
 
        memset(&state, 0, sizeof(state));
        found_bisect = wt_status_check_bisect(wt, &state) &&
-                      state.branch &&
+                      state.bisecting_from &&
                       skip_prefix(target, "refs/heads/", &target) &&
-                      !strcmp(state.branch, target);
+                      !strcmp(state.bisecting_from, target);
        wt_status_state_free_buffers(&state);
        return found_bisect;
 }