From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Feb 2021 22:05:55 +0000 (-0800)
Subject: Merge branch 'ab/branch-sort' into maint
X-Git-Tag: v2.30.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2d156dc4891dc1f0e86907fe20d3ac08d3cfde1;p=thirdparty%2Fgit.git

Merge branch 'ab/branch-sort' into maint

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
---

f2d156dc4891dc1f0e86907fe20d3ac08d3cfde1