All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Patrick Steinhardt <ps@pks.im>,
	 git@vger.kernel.org,  Kyle Lippincott <spectral@google.com>
Subject: Re: [PATCH 2/2] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
Date: Fri, 20 Dec 2024 07:04:47 -0800	[thread overview]
Message-ID: <xmqqwmfufl9s.fsf@gitster.g> (raw)
In-Reply-To: <20241220073720.GB2389154@coredump.intra.peff.net> (Jeff King's message of "Fri, 20 Dec 2024 02:37:20 -0500")

Jeff King <peff@peff.net> writes:

> On Thu, Dec 19, 2024 at 04:53:37PM +0100, Patrick Steinhardt wrote:
>
>>  GIT_VERSION=$(expr "$VN" : v*'\(.*\)')
>> -GIT_BUILT_FROM_COMMIT=$(git -C "$SOURCE_DIR" rev-parse -q --verify HEAD 2>/dev/null)
>> -GIT_DATE=$(git -C "$SOURCE_DIR" show --quiet --format='%as' 2>/dev/null)
>> +
>> +if test -z "$GIT_BUILT_FROM_COMMIT"
>> +then
>> +    GIT_BUILT_FROM_COMMIT=$(git -C "$SOURCE_DIR" rev-parse -q --verify HEAD 2>/dev/null)
>> +fi
>> +
>> +if test -z "$GIT_DATE"
>> +then
>> +    GIT_DATE=$(git -C "$SOURCE_DIR" show --quiet --format='%as' 2>/dev/null)
>> +fi
>
> Looks good. I doubt anybody would want to override BUILT_FROM_COMMIT
> (and it was never possible to do so, even before your recent patches),
> but it's reasonable to include it as well.

Thanks, both.

  reply	other threads:[~2024-12-20 15:04 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 [this message]
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
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=xmqqwmfufl9s.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=ps@pks.im \
    --cc=spectral@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.