Re: [PATCH 2/2] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE

From: Jeff King <peff@peff.net>
Date: Dec 20, 2024, 07:37 UTC
Message-ID: <20241220073720.GB2389154@coredump.intra.peff.net>
In-Reply-To: <20241219-b4-pks-git-version-via-environment-v1-2-9393af058240@pks.im>

On Thu, Dec 19, 2024 at 04:53:37PM +0100, Patrick Steinhardt wrote:

Show 13 quoted lines

>  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.

-Peff