From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Dec 2024 17:32:26 +0000 (-0800)
Subject: Merge branch 'ps/build-hotfix'
X-Git-Tag: v2.48.0-rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f074cdea467524afd355766c6cdb27d6d94d1e4e;p=thirdparty%2Fgit.git

Merge branch 'ps/build-hotfix'

A topic to optionally build with meson, which has graduated to
'master' recently, has regressed the normal Makefile build, which
is being corrected.

* ps/build-hotfix:
  meson: add options to override build information
  GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
  GIT-VERSION-GEN: fix overriding GIT_VERSION
  Makefile: introduce template for GIT-VERSION-GEN
  Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs
  Makefile: stop including "GIT-VERSION-FILE" in docs
---

f074cdea467524afd355766c6cdb27d6d94d1e4e