diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-02 22:51:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-02 22:51:29 +0100 |
| commit | cce4778520b6ade4bc839fe054500253f7d22570 (patch) | |
| tree | 56e9458171772e6730ec578d8c237ab034284218 /worktree.c | |
| parent | Merge branch 'la/trailer-cleanups' (diff) | |
| parent | status: fix branch shown when not only bisecting (diff) | |
| download | git-cce4778520b6ade4bc839fe054500253f7d22570.tar.xz git-cce4778520b6ade4bc839fe054500253f7d22570.zip | |
Merge branch 'rj/status-bisect-while-rebase'
"git status" is taught to show both the branch being bisected and
being rebased when both are in effect at the same time.
* rj/status-bisect-while-rebase:
status: fix branch shown when not only bisecting
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/worktree.c b/worktree.c index a56a6c2a3d..1399d452ac 100644 --- a/worktree.c +++ b/worktree.c @@ -395,9 +395,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; } |