]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/for-each-ref-multi-key-sort-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 May 2020 21:25:04 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 May 2020 21:25:04 +0000 (14:25 -0700)
"git branch" and other "for-each-ref" variants accepted multiple
--sort=<key> options in the increasing order of precedence, but it
had a few breakages around "--ignore-case" handling, and tie-breaking
with the refname, which have been fixed.

* jk/for-each-ref-multi-key-sort-fix:
  ref-filter: apply fallback refname sort only after all user sorts
  ref-filter: apply --ignore-case to all sorting keys

1  2 
builtin/branch.c
builtin/for-each-ref.c
builtin/tag.c
ref-filter.c
ref-filter.h
t/t6300-for-each-ref.sh

Simple merge
Simple merge
diff --cc builtin/tag.c
Simple merge
diff --cc ref-filter.c
Simple merge
diff --cc ref-filter.h
Simple merge
Simple merge