diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-02 21:51:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-02 21:51:29 (GMT) |
| commit | cce4778520b6ade4bc839fe054500253f7d22570 (patch) | |
| tree | 56e9458171772e6730ec578d8c237ab034284218 /ref-filter.c | |
| parent | 59a29e1274948bf9a3ef44c65903d09194464e1c (diff) | |
| parent | 990adccbdf0d8d1056c49a5ed546e744f542ba8f (diff) | |
| download | git-cce4778520b6ade4bc839fe054500253f7d22570.zip git-cce4778520b6ade4bc839fe054500253f7d22570.tar.gz git-cce4778520b6ade4bc839fe054500253f7d22570.tar.bz2 | |
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 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ref-filter.c b/ref-filter.c index fdaabb5..0239761 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2212,7 +2212,7 @@ char *get_head_description(void) state.detached_from); } else if (state.bisect_in_progress) strbuf_addf(&desc, _("(no branch, bisect started on %s)"), - state.branch); + state.bisecting_from); else if (state.detached_from) { if (state.detached_at) strbuf_addf(&desc, _("(HEAD detached at %s)"), |