Re: [PATCH 2/6] Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)

From: Jeff King <peff@peff.net>
Date: Oct 25, 2021, 18:57 UTC
Message-ID: <YXb9nYRWBxa7jDKB@coredump.intra.peff.net>
In-Reply-To: <patch-2.6-7cc3a1d7205-20211021T195538Z-avarab@gmail.com>

On Thu, Oct 21, 2021 at 09:57:56PM +0200, Ævar Arnfjörð Bjarmason wrote:

Show 18 quoted lines

> Remove the $(GIT_VERSION) from $(SCRIPT_DEFINES). Now every time HEAD
> changes in a development copy we don't need to re-build the scripts
> and script libraries.
> 
> This has not been needed since 2b9391bc675 (Makefile: do not replace
> @@GIT_VERSION@@ in shell scripts, 2012-06-20). On my setup this
> changes the re-making of 44 targets in a development copy where moved
> HEAD to 27.
> 
> The $(GIT_VERSION) was seemingly left here by mistake or omission. We
> didn't need it since 2b9391bc675, but in the later
> e4dd89ab984 (Makefile: update scripts when build-time parameters
> change, 2012-06-20) it was added to SCRIPT_DEFINES.
> 
> The two were part of the same series of patches, and given the summary
> in [1] and [2] it looks like this was probably a case of some earlier
> version of a later patch being combined with an updated earlier patch.
>

Yeah, that seems likely. No such version hit the list, but I probably wrote the SCRIPT_DEFINES one first, and then realized GIT_VERSION could be dropped, but didn't update the other.

At any rate, your patch looks like the correct thing to do.

-Peff