git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC PATCH] gitweb: use HEAD as primary sort key in git_get_heads_list()

From
Greg Hurrell <greg@hurrell.net>
Date
Jun 6, 2021, 08:57 UTC
Message-ID
<20210606085732.15001-1-greg@hurrell.net>
In-Reply-To
<20210606085116.13739-1-greg@hurrell.net>

Prior to this commit, the "heads" section on a gitweb summary page would list the heads in `-committerdate` order (ie. the most recently-modified ones at the top).

In my own repos I have started to move from "master" towards "main", but I keep "master" around and in sync with "main" so as not to break existing clones. As such, they always point at the same commit.

This means that in the "heads" listing of a gitweb instance, the display order ends up being determined by how `git for-each-ref` decides to tie-break "master" and "main"

For example, right now on a sample repo, gitweb shows the heads in this order, even though "master" and "main" reference the same commit. The tie-breaking evidently isn't happening lexicographically:

- master
- main
- pu
- next

So, this commit adds another `--sort` parameter to the `git for-each-ref` invocation in `git_get_heads_list()`, ensuring that the `HEAD` ref always ends up getting sorted to the top:

- main
- master
- pu
- next

This seems to be a useful change, because I can't see anywhere else in the gitweb UI where we actually indicate to the user what the "default" branch is (ie. what they'll checkout if they run `git clone`).

Signed-off-by: Greg Hurrell <greg@hurrell.net>
---

Resending because I forgot the Signed-off-by the first time. Sorry for the noise.

 gitweb/gitweb.perl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e09e024a09..e5270b0291 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3796,7 +3796,8 @@ sub git_get_heads_list {
 	my @headslist;
 
 	open my $fd, '-|', git_cmd(), 'for-each-ref',
-		($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
+		($limit ? '--count='.($limit+1) : ()),
+		'--sort=-committerdate', '--sort=-HEAD',
 		'--format=%(objectname) %(refname) %(subject)%00%(committer)',
 		@patterns
 		or return;
-- 
2.29.2
Previous: Greg HurrellNext: Jeff King
Message 2 of 10 in “gitweb: use HEAD as primary sort key in git_get_heads_list()”
  1. gitweb: use HEAD as primary sort key in git_get_heads_list()Greg Hurrell, Jun 6, 2021
  2. gitweb: use HEAD as primary sort key in git_get_heads_list()Greg Hurrell, Jun 6, 2021
  3. Jeff KingJun 8, 2021
  4. Greg HurrellJun 8, 2021
  5. Greg HurrellJun 8, 2021
  6. Jeff KingJun 8, 2021
  7. Junio C HamanoJun 9, 2021
  8. Greg HurrellJun 9, 2021
  9. Junio C HamanoJun 9, 2021
  10. gitweb: use HEAD as secondary sort key in git_get_heads_list()Greg Hurrell, Jun 9, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.