From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH] tests: prefer host Git to verify chainlint self-checks
Date: Tue, 12 Dec 2023 11:30:22 -0800 [thread overview]
Message-ID: <xmqq8r5zrzg1.fsf@gitster.g> (raw)
In-Reply-To: <4112adbe467c14a8f22a87ea41aa4705f8760cf6.1702380646.git.ps@pks.im> (Patrick Steinhardt's message of "Tue, 12 Dec 2023 12:32:50 +0100")
Patrick Steinhardt <ps@pks.im> writes:
> To accomodate for cases where the host system has no Git installation we
> use the locally-compiled version of Git. This can result in problems
> though when the Git project's repository is using extensions that the
> locally-compiled version of Git doesn't understand. It will refuse to
> run and thus cause the checks to fail.
>
> Fix this issue by prefering the host's Git resolved via PATH. If it
> doesn't exist, then we fall back to the locally-compiled Git version and
> diff as before.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>
> I've started to dogfood the reftable backend on my local machine and
> have converted many repositories to use the reftable backend. This
> surfaced the described issue because the repository now sets up the
> "extensions.refStorage" extension, and thus "check-chainlint" fails
> depending on which versions of Git I'm trying to compile and test.
I do not think "prefer host Git" is necessarily a good idea; falling
back to use host Git is perfectly fine, of course.
Other than that, I agree with the motivation.
> t/Makefile | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/t/Makefile b/t/Makefile
> index 225aaf78ed..8b7f7aceaa 100644
> --- a/t/Makefile
> +++ b/t/Makefile
> @@ -111,7 +111,9 @@ check-chainlint:
> if test -f ../GIT-BUILD-OPTIONS; then \
> . ../GIT-BUILD-OPTIONS; \
> fi && \
> - if test -x ../git$$X; then \
> + if command -v git >/dev/null 2>&1; then \
> + DIFFW="git --no-pager diff -w --no-index"; \
> + elif test -x ../git$$X; then \
> DIFFW="../git$$X --no-pager diff -w --no-index"; \
> else \
> DIFFW="diff -w -u"; \
next prev parent reply other threads:[~2023-12-12 19:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 11:32 [PATCH] tests: prefer host Git to verify chainlint self-checks Patrick Steinhardt
2023-12-12 19:30 ` Junio C Hamano [this message]
2023-12-13 7:20 ` Patrick Steinhardt
2023-12-13 15:11 ` Junio C Hamano
2023-12-14 3:33 ` Eric Sunshine
2023-12-14 8:13 ` Patrick Steinhardt
2023-12-14 8:39 ` Eric Sunshine
2023-12-14 8:40 ` Patrick Steinhardt
2023-12-14 16:16 ` Junio C Hamano
2023-12-14 18:10 ` Eric Sunshine
2023-12-14 19:13 ` Junio C Hamano
2023-12-15 5:33 ` Patrick Steinhardt
2023-12-14 8:30 ` [PATCH v2] tests: adjust whitespace in chainlint expectations Patrick Steinhardt
2023-12-14 8:44 ` Eric Sunshine
2023-12-15 6:04 ` [PATCH v3] " Patrick Steinhardt
2023-12-15 6:24 ` Eric Sunshine
2023-12-15 6:29 ` Patrick Steinhardt
2023-12-15 6:40 ` Eric Sunshine
2023-12-15 6:42 ` [PATCH v4] " Patrick Steinhardt
2023-12-15 7:17 ` Eric Sunshine
2023-12-15 16:44 ` 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=xmqq8r5zrzg1.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
--cc=sunshine@sunshineco.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;
as well as URLs for NNTP newsgroup(s).