diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:17 -0800 |
| commit | 9e409d7e0762ff55c2787b4a106bf80ab2d57471 (patch) | |
| tree | af5e0a1c19792b91cee3794e2b20c2969cecca16 /wt-status.c | |
| parent | Merge branch 'en/diffcore-rename' (diff) | |
| parent | branch: show "HEAD detached" first under reverse sort (diff) | |
| download | git-9e409d7e0762ff55c2787b4a106bf80ab2d57471.tar.gz git-9e409d7e0762ff55c2787b4a106bf80ab2d57471.zip | |
Merge branch 'ab/branch-sort'
The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
* ab/branch-sort:
branch: show "HEAD detached" first under reverse sort
branch: sort detached HEAD based on a flag
ref-filter: move ref_sorting flags to a bitfield
ref-filter: move "cmp_fn" assignment into "else if" arm
ref-filter: add braces to if/else if/else chain
branch tests: add to --sort tests
branch: change "--local" to "--list" in comment
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 7074bbdd53..40b59be478 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1742,9 +1742,9 @@ static void wt_longstatus_print(struct wt_status *s) } else if (s->state.detached_from) { branch_name = s->state.detached_from; if (s->state.detached_at) - on_what = HEAD_DETACHED_AT; + on_what = _("HEAD detached at "); else - on_what = HEAD_DETACHED_FROM; + on_what = _("HEAD detached from "); } else { branch_name = ""; on_what = _("Not currently on any branch."); |