From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 22 Jul 2025 16:13:31 +0000 (+0200)
Subject: Merge branch 'mr/sort-refs-by-type'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2874c649609a8c987e5c1ad1e5fe7f89445263f;p=thirdparty%2Fgit.git

Merge branch 'mr/sort-refs-by-type'

* mr/sort-refs-by-type:
  gitk: separate upstream refs when using the sort-by-type option
  gitk: make 'sort-refs-by-type' optional and persistent
  gitk: sort by ref type on the 'tags and heads' view
---

e2874c649609a8c987e5c1ad1e5fe7f89445263f
diff --cc gitk
index fa0d9a94e5,38c2c81a79..153ca3e640
--- a/gitk
+++ b/gitk
@@@ -1979,9 -1976,8 +1979,9 @@@ proc readrefs {} 
      global selecthead selectheadid
      global hideremotes
      global tclencoding
 +    global hashlength
  
-     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
+     foreach v {tagids idtags headids idheads otherrefids idotherrefs upstreamofref} {
          unset -nocomplain $v
      }
      set refd [safe_open_command [list git show-ref -d]]