Merge branch 'md/sort-detached-head-first'

"git branch --list" learned to always output the detached HEAD as
the first item (when the HEAD is detached, of course), regardless
of the locale.

* md/sort-detached-head-first:
  ref-filter: sort detached HEAD lines firstly
This commit is contained in:
Junio C Hamano
2019-07-09 15:25:42 -07:00
3 changed files with 21 additions and 18 deletions

View File

@ -1676,9 +1676,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.");