diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:29 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:29 +0300 |
commit | cce4778520b6ade4bc839fe054500253f7d22570 (patch) | |
tree | 56e9458171772e6730ec578d8c237ab034284218 /branch.c | |
parent | 59a29e1274948bf9a3ef44c65903d09194464e1c (diff) | |
parent | 990adccbdf0d8d1056c49a5ed546e744f542ba8f (diff) |
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 'branch.c')
-rw-r--r-- | branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -420,9 +420,9 @@ static void prepare_checked_out_branches(void) wt_status_state_free_buffers(&state); if (wt_status_check_bisect(wt, &state) && - state.branch) { + state.bisecting_from) { struct strbuf ref = STRBUF_INIT; - strbuf_addf(&ref, "refs/heads/%s", state.branch); + strbuf_addf(&ref, "refs/heads/%s", state.bisecting_from); old = strmap_put(¤t_checked_out_branches, ref.buf, xstrdup(wt->path)); |