From: Jeff King <peff@peff.net>
To: Greg Hurrell <greg@hurrell.net>
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH] gitweb: use HEAD as primary sort key in git_get_heads_list()
Date: Tue, 8 Jun 2021 04:34:21 -0400 [thread overview]
Message-ID: <YL8rjeKQPOtQSyzT@coredump.intra.peff.net> (raw)
In-Reply-To: <20210606085732.15001-1-greg@hurrell.net>
On Sun, Jun 06, 2021 at 10:57:32AM +0200, Greg Hurrell wrote:
> 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"
Hmm. I'd have expected it to, because we start the list in lexicographic
order. I suspect the sort we use simply isn't stable (in a simple 3-ref
example I made, "main" did sort before "master" by default). That would
be easy to fix, of course, but there may be value in using the HEAD rule
anyway.
> 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
In your earlier example, it sounded like you were primarily concerned
with breaking ties. But here it sounds like you're proposing putting the
HEAD first _regardless_ of the committer timestamp.
I don't have a strong feeling either way on that. It may surface an
older branch, but in general I'd expect the HEAD to be reasonably
up-to-date (unless somebody has a weird workflow that does not really
use it at all, and expects people to always clone with "-b" or
whatever. We can probably discount that).
It doesn't help the stability of non-HEAD branches that are in ties.
I.e., I wonder if this should be two separate patches:
1. break ties by name, like:
git for-each-ref --sort=refname --sort=-committerdate
2. emphasize the HEAD branch, even if it isn't the newest:
git for-each-ref --sort=refname --sort=-committerdate --sort=-HEAD
-Peff
next prev parent reply other threads:[~2021-06-08 8:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-06 8:51 [RFC PATCH] gitweb: use HEAD as primary sort key in git_get_heads_list() Greg Hurrell
2021-06-06 8:57 ` Greg Hurrell
2021-06-08 8:34 ` Jeff King [this message]
2021-06-08 9:02 ` Greg Hurrell
2021-06-08 21:14 ` Greg Hurrell
2021-06-08 22:07 ` Jeff King
2021-06-09 0:15 ` Junio C Hamano
2021-06-09 7:38 ` Greg Hurrell
2021-06-09 7:47 ` Junio C Hamano
2021-06-09 19:28 ` [PATCH v2] gitweb: use HEAD as secondary " Greg Hurrell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YL8rjeKQPOtQSyzT@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=greg@hurrell.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).