From: Tuomas Ahola <taahol@utu.fi>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>, <git@vger.kernel.org>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH] describe: fix --exclude, --match with --contains and --all
Date: Mon, 1 Jun 2026 02:46:44 +0300 [thread overview]
Message-ID: <20260531234644.97LRl%taahol@utu.fi> (raw)
In-Reply-To: <xmqqo6hwcves.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> wrote:
> It is curious that this fails in some but not all CI jobs, and even
> more curious that these failures look the same.
>
> e.g., https://github.com/git/git/actions/runs/26671595367/job/78615760984#step:4:1984
>
> +++ diff -u expect actual
> --- expect 2026-05-30 02:21:23
> +++ actual 2026-05-30 02:21:23
> @@ -1 +1 @@
> -branch_A
> +remotes/origin/remote_branch_A
> error: last command exited with $?=1
> not ok 70 - describe --contains --all --exclude
> #
> # echo "branch_A" >expect &&
> # tagged_commit=$(git rev-parse "refs/tags/A^0") &&
> # git describe --contains --all --exclude="A" --exclude="c" --exclude="test*" $tagged_commit >actual &&
> # test_cmp expect actual
>
> Rings any bell?
That's way out of my wheelhouse but this seems to fix the failure
for Alpine at least:
-----8<-----
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index d6594ada53..1776ffab46 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -416,7 +416,7 @@ static void name_tips(struct mem_pool *string_pool)
* Try to set better names first, so that worse ones spread
* less.
*/
- QSORT(tip_table.table, tip_table.nr, cmp_by_tag_and_age);
+ STABLE_QSORT(tip_table.table, tip_table.nr, cmp_by_tag_and_age);
for (i = 0; i < tip_table.nr; i++) {
struct tip_table_entry *e = &tip_table.table[i];
if (e->commit) {
next prev parent reply other threads:[~2026-06-01 0:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-28 23:29 [PATCH] describe: fix --exclude, --match with --contains and --all Jacob Keller
2026-05-30 23:47 ` Junio C Hamano
2026-05-31 23:46 ` Tuomas Ahola [this message]
2026-06-01 0:40 ` Junio C Hamano
2026-06-01 22:35 ` Jacob Keller
2026-06-02 0:10 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260531234644.97LRl%taahol@utu.fi \
--to=taahol@utu.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox