From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
Colin Stagner <ask+git@howdoi.land>,
Patrik Weiskircher <patrik@pspdfkit.com>,
Adam Dinwoodie <adam@dinwoodie.org>
Subject: Re* [RFH] adding test coverage for contrib/ in CI jobs
Date: Tue, 03 Feb 2026 09:06:04 -0800 [thread overview]
Message-ID: <xmqqjywtu58j.fsf_-_@gitster.g> (raw)
In-Reply-To: <xmqqsebhu9nn.fsf_-_@gitster.g> (Junio C. Hamano's message of "Tue, 03 Feb 2026 07:30:36 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Unfortunately, this seems to reveal existing other problems with
> subtree tests (t7900), in addition to diff-highlight tests (t9400)
> in various configurations.
>
> https://github.com/git/git/actions/runs/21617099884
>
> This Ci run is near the tip of 'seen', so there may be breakages
> attributable to new topics in flight, but I suspect that many of
> them are already in 'master', noticed by nobody because nobody ran
> these tests in these configurations (like "breaking changes",
> "sha256", "leaks", "reftable", "asan").
>
> I didn't look into the details of any of these (yet).
I didn't look into CI failures but spotted an easy one by
eyeballing. As we seem to be lacking a dedicated subsystem
maintainer for this tool, I am CCing those who have touched this
test file during the past 24 months, plus our resident reftable
expert.
----- >8 -----
Subject: subtree: allow testing with reftable backend
"git subtree" (in contrib/) comes with its own test script, which
has this line
defaultBranch=$(sed "s,ref: refs/heads/,," "$test_count/.git/HEAD")
that assumes that you can read from .git/HEAD as a regular text file
and you'd find a textual symref in reffiles backend.
Not necessarily.
make && cd contrib/subtree &&
GIT_TEST_DEFAULT_REF_FORMAT=reftable make test
fails due to this. Use "git symbolic-ref" instead to read the value
of the symref.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
contrib/subtree/t/t7900-subtree.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git c/contrib/subtree/t/t7900-subtree.sh w/contrib/subtree/t/t7900-subtree.sh
index 316dc5269e..344956e72e 100755
--- c/contrib/subtree/t/t7900-subtree.sh
+++ w/contrib/subtree/t/t7900-subtree.sh
@@ -1597,7 +1597,8 @@ test_expect_success 'push split to subproj' '
test_expect_success 'subtree descendant check' '
subtree_test_create_repo "$test_count" &&
- defaultBranch=$(sed "s,ref: refs/heads/,," "$test_count/.git/HEAD") &&
+
+ defaultBranch=$(git -C "$test_count" symbolic-ref --short HEAD) &&
test_create_commit "$test_count" folder_subtree/a &&
(
cd "$test_count" &&
next prev parent reply other threads:[~2026-02-03 17:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-15 12:09 [PATCH] subtree: validate --prefix against commit in split Pushkar Singh
2026-01-15 12:24 ` [PATCH v2] " Pushkar Singh
2026-01-15 16:30 ` Junio C Hamano
2026-01-15 17:52 ` [PATCH v3] " Pushkar Singh
2026-02-02 18:54 ` Josh Steadmon
2026-02-02 19:10 ` Junio C Hamano
2026-02-02 21:07 ` Junio C Hamano
2026-02-03 15:30 ` [RFH] adding test coverage for contrib/ in CI jobs Junio C Hamano
2026-02-03 17:06 ` Junio C Hamano [this message]
2026-02-03 23:09 ` Re* " Junio C Hamano
2026-02-04 4:38 ` Colin Stagner
2026-02-04 19:55 ` Junio C Hamano
2026-02-05 6:05 ` Colin Stagner
2026-02-05 16:39 ` Junio C Hamano
2026-02-05 20:54 ` Junio C Hamano
2026-02-03 21:26 ` Junio C Hamano
2026-02-03 21:53 ` Jeff King
2026-02-03 16:48 ` [PATCH v4] subtree: validate --prefix against commit in split Pushkar Singh
2026-02-03 17:37 ` 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=xmqqjywtu58j.fsf_-_@gitster.g \
--to=gitster@pobox.com \
--cc=adam@dinwoodie.org \
--cc=ask+git@howdoi.land \
--cc=git@vger.kernel.org \
--cc=patrik@pspdfkit.com \
--cc=ps@pks.im \
/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