git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 1/5] GIT-VERSION-GEN: fix overriding version via environment

From
Patrick Steinhardt <ps@pks.im>
Date
Dec 20, 2024, 16:23 UTC
Message-ID
<Z2WZ_6auUm0mVIqr@pks.im>
In-Reply-To
<xmqqpllme3cl.fsf@gitster.g>
On Fri, Dec 20, 2024 at 08:17:14AM -0800, Junio C Hamano wrote:
Show 32 quoted lines
> 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 think for now I'll keep $VN, if even just to discern the intermediate value without the leading "v" stripped from the final version that we have in "$GIT_VERSION". But I'll send a revised version where I make the control flow a bit more obvious.

Thanks!
Patrick
Previous: Junio C HamanoNext: Patrick Steinhardt
Message 19 of 44 in “GIT-VERSION-GEN: fix overriding values”
  1. 0/2 GIT-VERSION-GEN: fix overriding valuesPatrick Steinhardt, Dec 19, 2024
  2. 2/2 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt, Dec 19, 2024
  3. Kyle LippincottDec 19, 2024
  4. Junio C HamanoDec 19, 2024
  5. Jeff KingDec 20, 2024
  6. Junio C HamanoDec 20, 2024
  7. 1/2 GIT-VERSION-GEN: fix overriding version via environmentPatrick Steinhardt, Dec 19, 2024
  8. Junio C HamanoDec 19, 2024
  9. Jeff KingDec 20, 2024
  10. Patrick SteinhardtDec 20, 2024
  11. Jeff KingDec 20, 2024
  12. Patrick SteinhardtDec 20, 2024
  13. Jeff KingDec 20, 2024
  14. Patrick SteinhardtDec 20, 2024
  15. 0/5 GIT-VERSION-GEN: fix overriding valuesPatrick Steinhardt, Dec 20, 2024
  16. 1/5 GIT-VERSION-GEN: fix overriding version via environmentPatrick Steinhardt, Dec 20, 2024
  17. Jeff KingDec 20, 2024
  18. Junio C HamanoDec 20, 2024
  19. Patrick SteinhardtDec 20, 2024
  20. Patrick SteinhardtDec 20, 2024
  21. 2/5 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt, Dec 20, 2024
  22. 3/5 Makefile: drop unneeded indirection for GIT-VERSION-GEN outputsPatrick Steinhardt, Dec 20, 2024
  23. Jeff KingDec 20, 2024
  24. 4/5 Makefile: respect build info declared in "config.mak"Patrick Steinhardt, Dec 20, 2024
  25. Jeff KingDec 20, 2024
  26. Patrick SteinhardtDec 20, 2024
  27. Jeff KingDec 20, 2024
  28. Patrick SteinhardtDec 20, 2024
  29. Patrick SteinhardtDec 20, 2024
  30. Jeff KingDec 20, 2024
  31. Patrick SteinhardtDec 20, 2024
  32. Patrick SteinhardtDec 20, 2024
  33. Jeff KingDec 28, 2024
  34. 5/5 meson: add options to override build informationPatrick Steinhardt, Dec 20, 2024
  35. Jeff KingDec 20, 2024
  36. 0/6 GIT-VERSION-GEN: fix overriding valuesPatrick Steinhardt, Dec 20, 2024
  37. 1/6 Makefile: stop including "GIT-VERSION-FILE" in docsPatrick Steinhardt, Dec 20, 2024
  38. 2/6 Makefile: drop unneeded indirection for GIT-VERSION-GEN outputsPatrick Steinhardt, Dec 20, 2024
  39. 3/6 Makefile: introduce template for GIT-VERSION-GENPatrick Steinhardt, Dec 20, 2024
  40. 4/6 GIT-VERSION-GEN: fix overriding GIT_VERSIONPatrick Steinhardt, Dec 20, 2024
  41. Junio C HamanoDec 20, 2024
  42. Patrick SteinhardtDec 21, 2024
  43. 6/6 meson: add options to override build informationPatrick Steinhardt, Dec 20, 2024
  44. 5/6 GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt, Dec 20, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.