git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Patrick Steinhardt <ps@pks.im>,
	 git@vger.kernel.org,  Kyle Lippincott <spectral@google.com>
Subject: Re: [PATCH v2 1/5] GIT-VERSION-GEN: fix overriding version via environment
Date: Fri, 20 Dec 2024 08:17:14 -0800	[thread overview]
Message-ID: <xmqqpllme3cl.fsf@gitster.g> (raw)
In-Reply-To: <20241220155223.GA152570@coredump.intra.peff.net> (Jeff King's message of "Fri, 20 Dec 2024 10:52:23 -0500")

Jeff King <peff@peff.net> writes:

> So I dunno. I like keeping things simple, but I also like skipping
> unnecessary code, too. Maybe if the top hunk were:
>
>   if test -n "$GIT_VERSION"
>   then
>     : do nothing, we will use this value verbatim
>   elif ...
>
> that would make the intended flow more obvious.

True.

> There are probably other ways to structure it, too. The whole $VN thing
> could be inside the:
>
>   if test -z "$GIT_VERSION"
>
> block. Or alternatively, if each block of the if/else just ran expr and
> set $GIT_VERSION itself (perhaps with a one-liner helper function) then
> we wouldn't need $VN at all.

True again.  It has been quite a while since I wrote the original
before the meson topic came up and the script hasn't changed for a
long time (other than DEF_VER line for obvious reasons), but I think
in that ancient version, $VN _was_ the variable to be looked at and
GIT_VERSION did not even exist as a shell variable at all.

If $GIT_VERSION is serving the same role as old $VN in the
mesonified version, perhaps we should get rid of the $VN variable to
clarify the new world order.

> I don't know how much trouble it's worth to refactor all this. Mostly I
> was just surprised to see the first hunk at all in this version.
>
> -Peff

  parent reply	other threads:[~2024-12-20 16:17 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-19 15:53 [PATCH 0/2] GIT-VERSION-GEN: fix overriding values Patrick Steinhardt
2024-12-19 15:53 ` [PATCH 1/2] GIT-VERSION-GEN: fix overriding version via environment Patrick Steinhardt
2024-12-19 18:49   ` Junio C Hamano
2024-12-20  7:34   ` Jeff King
2024-12-20  8:45     ` Patrick Steinhardt
2024-12-20  8:56       ` Jeff King
2024-12-20  9:31         ` Patrick Steinhardt
2024-12-20 11:17           ` Jeff King
2024-12-20 12:22             ` Patrick Steinhardt
2024-12-19 15:53 ` [PATCH 2/2] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE Patrick Steinhardt
2024-12-19 21:19   ` Kyle Lippincott
2024-12-19 21:59     ` Junio C Hamano
2024-12-20  7:37   ` Jeff King
2024-12-20 15:04     ` Junio C Hamano
2024-12-20 12:22 ` [PATCH v2 0/5] GIT-VERSION-GEN: fix overriding values Patrick Steinhardt
2024-12-20 12:22   ` [PATCH v2 1/5] GIT-VERSION-GEN: fix overriding version via environment Patrick Steinhardt
2024-12-20 15:52     ` Jeff King
2024-12-20 16:16       ` Patrick Steinhardt
2024-12-20 16:17       ` Junio C Hamano [this message]
2024-12-20 16:23         ` Patrick Steinhardt
2024-12-20 12:22   ` [PATCH v2 2/5] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE Patrick Steinhardt
2024-12-20 12:22   ` [PATCH v2 3/5] Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs Patrick Steinhardt
2024-12-20 15:53     ` Jeff King
2024-12-20 12:22   ` [PATCH v2 4/5] Makefile: respect build info declared in "config.mak" Patrick Steinhardt
2024-12-20 15:54     ` Jeff King
2024-12-20 16:47       ` Patrick Steinhardt
2024-12-20 17:51         ` Jeff King
2024-12-20 18:02           ` Patrick Steinhardt
2024-12-20 18:18             ` Patrick Steinhardt
2024-12-20 18:24             ` Jeff King
2024-12-20 18:39               ` Patrick Steinhardt
2024-12-20 19:07                 ` Patrick Steinhardt
2024-12-28 19:43                   ` Jeff King
2024-12-20 12:22   ` [PATCH v2 5/5] meson: add options to override build information Patrick Steinhardt
2024-12-20 15:56   ` [PATCH v2 0/5] GIT-VERSION-GEN: fix overriding values Jeff King
2024-12-20 19:44 ` [PATCH v3 0/6] " Patrick Steinhardt
2024-12-20 19:44   ` [PATCH v3 1/6] Makefile: stop including "GIT-VERSION-FILE" in docs Patrick Steinhardt
2024-12-20 19:44   ` [PATCH v3 2/6] Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs Patrick Steinhardt
2024-12-20 19:44   ` [PATCH v3 3/6] Makefile: introduce template for GIT-VERSION-GEN Patrick Steinhardt
2024-12-20 19:44   ` [PATCH v3 4/6] GIT-VERSION-GEN: fix overriding GIT_VERSION Patrick Steinhardt
2024-12-20 21:50     ` Junio C Hamano
2024-12-21 10:30       ` Patrick Steinhardt
2024-12-20 19:44   ` [PATCH v3 5/6] GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE Patrick Steinhardt
2024-12-20 19:44   ` [PATCH v3 6/6] meson: add options to override build information Patrick Steinhardt

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=xmqqpllme3cl.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=ps@pks.im \
    --cc=spectral@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).