From: Junio C Hamano <gitster@pobox•com>
To: Patrick Steinhardt <ps@pks•im>
Cc: git@vger•kernel.org, Kyle Lippincott <spectral@google•com>,
Jeff King <peff@peff•net>
Subject: Re: [PATCH v3 4/6] GIT-VERSION-GEN: fix overriding GIT_VERSION
Date: Fri, 20 Dec 2024 13:50:25 -0800 [thread overview]
Message-ID: <xmqq4j2ydnxa.fsf@gitster.g> (raw)
In-Reply-To: <20241220-b4-pks-git-version-via-environment-v3-4-1fd79b52a5fb@pks.im> (Patrick Steinhardt's message of "Fri, 20 Dec 2024 20:44:24 +0100")
Patrick Steinhardt <ps@pks•im> writes:
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index ff30ab6c4295525757f6a150ec4ff0c72487f440..a89823e1d1ee5042367bdcca6ed426196d49ce89 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -181,6 +181,10 @@ endif
> -include ../config.mak.autogen
> -include ../config.mak
>
> +# Set GIT_VERSION_OVERRIDE such that version_gen knows to substitute
> +# GIT_VERSION in case it was set by the user.
> +GIT_VERSION_OVERRIDE := $(GIT_VERSION)
> +
> ifndef NO_MAN_BOLD_LITERAL
> XMLTO_EXTRA += -m manpage-bold-literal.xsl
> endif
So the idea is that those targets and scripts may have their own
GIT_VERION value when they run GIT-VERSION-GEN to cause GIT_VERSION
to computed, and in such a case, they should pass the GIT_VERSION
they have in GIT_VERSION_OVERRIDE, and thanks to the version_gen
thing, this value in GIT_VERSION_OVERRIDE is passed in the
environment as GIT_VERSION when GIT-VERSION-GEN is run, and the
value in turn is passed intact. Somehow this makes my head spin, as
it looks quite convoluted, but the overall flow should yield the
desired value.
Queued. Thanks.
next prev parent reply other threads:[~2024-12-20 21:50 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-19 15:53 [PATCH 0/2] GIT-VERSION-GEN: fix overriding values Patrick Steinhardt
2024-12-19 15:53 ` [PATCH 1/2] GIT-VERSION-GEN: fix overriding version via environment Patrick Steinhardt
2024-12-19 18:49 ` Junio C Hamano
2024-12-20 7:34 ` Jeff King
2024-12-20 8:45 ` Patrick Steinhardt
2024-12-20 8:56 ` Jeff King
2024-12-20 9:31 ` Patrick Steinhardt
2024-12-20 11:17 ` Jeff King
2024-12-20 12:22 ` Patrick Steinhardt
2024-12-19 15:53 ` [PATCH 2/2] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE Patrick Steinhardt
2024-12-19 21:19 ` Kyle Lippincott
2024-12-19 21:59 ` Junio C Hamano
2024-12-20 7:37 ` Jeff King
2024-12-20 15:04 ` Junio C Hamano
2024-12-20 12:22 ` [PATCH v2 0/5] GIT-VERSION-GEN: fix overriding values Patrick Steinhardt
2024-12-20 12:22 ` [PATCH v2 1/5] GIT-VERSION-GEN: fix overriding version via environment Patrick Steinhardt
2024-12-20 15:52 ` Jeff King
2024-12-20 16:16 ` Patrick Steinhardt
2024-12-20 16:17 ` Junio C Hamano
2024-12-20 16:23 ` Patrick Steinhardt
2024-12-20 12:22 ` [PATCH v2 2/5] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE Patrick Steinhardt
2024-12-20 12:22 ` [PATCH v2 3/5] Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs Patrick Steinhardt
2024-12-20 15:53 ` Jeff King
2024-12-20 12:22 ` [PATCH v2 4/5] Makefile: respect build info declared in "config.mak" Patrick Steinhardt
2024-12-20 15:54 ` Jeff King
2024-12-20 16:47 ` Patrick Steinhardt
2024-12-20 17:51 ` Jeff King
2024-12-20 18:02 ` Patrick Steinhardt
2024-12-20 18:18 ` Patrick Steinhardt
2024-12-20 18:24 ` Jeff King
2024-12-20 18:39 ` Patrick Steinhardt
2024-12-20 19:07 ` Patrick Steinhardt
2024-12-28 19:43 ` Jeff King
2024-12-20 12:22 ` [PATCH v2 5/5] meson: add options to override build information Patrick Steinhardt
2024-12-20 15:56 ` [PATCH v2 0/5] GIT-VERSION-GEN: fix overriding values Jeff King
2024-12-20 19:44 ` [PATCH v3 0/6] " Patrick Steinhardt
2024-12-20 19:44 ` [PATCH v3 1/6] Makefile: stop including "GIT-VERSION-FILE" in docs Patrick Steinhardt
2024-12-20 19:44 ` [PATCH v3 2/6] Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs Patrick Steinhardt
2024-12-20 19:44 ` [PATCH v3 3/6] Makefile: introduce template for GIT-VERSION-GEN Patrick Steinhardt
2024-12-20 19:44 ` [PATCH v3 4/6] GIT-VERSION-GEN: fix overriding GIT_VERSION Patrick Steinhardt
2024-12-20 21:50 ` Junio C Hamano [this message]
2024-12-21 10:30 ` Patrick Steinhardt
2024-12-20 19:44 ` [PATCH v3 5/6] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE Patrick Steinhardt
2024-12-20 19:44 ` [PATCH v3 6/6] meson: add options to override build information Patrick Steinhardt
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=xmqq4j2ydnxa.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=ps@pks$(echo .)im \
--cc=spectral@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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