From: Jeff King <peff@peff.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/6] Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
Date: Mon, 25 Oct 2021 14:57:11 -0400 [thread overview]
Message-ID: <YXb9nYRWBxa7jDKB@coredump.intra.peff.net> (raw)
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:
> 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
next prev parent reply other threads:[~2021-10-25 18:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 19:57 [PATCH 0/6] Makefile: be less eager to re-build, *.sh code cleanups Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` [PATCH 1/6] Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES) Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` [PATCH 2/6] Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES) Ævar Arnfjörð Bjarmason
2021-10-25 18:57 ` Jeff King [this message]
2021-10-21 19:57 ` [PATCH 3/6] Makefile: remove $(NO_CURL) " Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` [PATCH 4/6] git-instaweb: unconditionally assume that gitweb is mod_perl capable Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` [PATCH 5/6] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-10-22 0:27 ` Junio C Hamano
2021-10-21 19:58 ` [PATCH 6/6] git-sh-setup: remove "sane_grep", it's not needed anymore Ævar Arnfjörð Bjarmason
2021-10-21 23:17 ` Junio C Hamano
2021-10-22 14:27 ` Johannes Schindelin
2021-10-24 9:08 ` Junio C Hamano
2021-10-25 13:09 ` Johannes Schindelin
2021-10-25 17:14 ` Junio C Hamano
2021-10-25 19:08 ` [PATCH 0/6] Makefile: be less eager to re-build, *.sh code cleanups Jeff King
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=YXb9nYRWBxa7jDKB@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.