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

From: Kyle Lippincott <spectral@google.com>
Date: Dec 19, 2024, 21:19 UTC
Message-ID: <CAO_smVhcai9reesTRSrd=hHz2Sa2T7Bs-U1NZ9KcCN5PNv6T5Q@mail.gmail.com>
In-Reply-To: <20241219-b4-pks-git-version-via-environment-v1-2-9393af058240@pks.im>

On Thu, Dec 19, 2024 at 7:55 AM Patrick Steinhardt <ps@pks.im> wrote:

Show 12 quoted lines

>
> Same as with the preceding commit, neither GIT_BUILT_FROM_COMMIT nor
> GIT_DATE can be overridden via the environment. Especially the latter is
> of importance given that we set it in our own "Documentation/doc-diff"
> script.
>
> Make the values of both variables overridable.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  GIT-VERSION-GEN | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)

Looks good, thanks for fixing this and for all the work done on the cleanups for the build system changes.

Show 31 quoted lines

>
> diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
> index 787c6cfd04f0a43d0c1c8a6690185d26ccf2fc2f..f8367f6d09ff2ada8868e575d6ec8f1f9b27534d 100755
> --- a/GIT-VERSION-GEN
> +++ b/GIT-VERSION-GEN
> @@ -53,10 +53,18 @@ then
>  else
>         VN="$DEF_VER"
>  fi
> -
>  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
> +
>  if test -z "$GIT_USER_AGENT"
>  then
>         GIT_USER_AGENT="git/$GIT_VERSION"
>
> --
> 2.47.0
>