mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rj/status-bisect-while-rebase'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2024-01-02 13:51:29 -08:00
parent 59a29e1274 990adccbdf
commit cce4778520
6 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
branch.c
View File

@ -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(&current_checked_out_branches,
ref.buf,
xstrdup(wt->path));