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

Re: [PATCH v3 4/6] GIT-VERSION-GEN: fix overriding GIT_VERSION

From
Patrick Steinhardt <ps@pks.im>
Date
Dec 21, 2024, 10:30 UTC
Message-ID
<Z2aYx608clVG_sAF@pks.im>
In-Reply-To
<xmqq4j2ydnxa.fsf@gitster.g>
On Fri, Dec 20, 2024 at 01:50:25PM -0800, Junio C Hamano wrote:
Show 27 quoted lines
> Patrick Steinhardt <ps@pks.im> writes:
> 
> > diff --git a/Documentation/Makefile b/Documentation/Makefile
> > index ff30ab6c4295525757f6a150ec4ff0c72487f440..a89823e1d1ee5042367bdcca6ed426196d49ce89 100644
> > --- a/Documentation/Makefile
> > +++ b/Documentation/Makefile
> > @@ -181,6 +181,10 @@ endif
> >  -include ../config.mak.autogen
> >  -include ../config.mak
> >  
> > +# Set GIT_VERSION_OVERRIDE such that version_gen knows to substitute
> > +# GIT_VERSION in case it was set by the user.
> > +GIT_VERSION_OVERRIDE := $(GIT_VERSION)
> > +
> >  ifndef NO_MAN_BOLD_LITERAL
> >  XMLTO_EXTRA += -m manpage-bold-literal.xsl
> >  endif
> 
> So the idea is that those targets and scripts may have their own
> GIT_VERION value when they run GIT-VERSION-GEN to cause GIT_VERSION
> to computed, and in such a case, they should pass the GIT_VERSION
> they have in GIT_VERSION_OVERRIDE, and thanks to the version_gen
> thing, this value in GIT_VERSION_OVERRIDE is passed in the
> environment as GIT_VERSION when GIT-VERSION-GEN is run, and the
> value in turn is passed intact.  Somehow this makes my head spin, as
> it looks quite convoluted, but the overall flow should yield the
> desired value.

Agreed, it makes mine spin, as well. Next release cycle I'll have a look at whether I can get rid of the include of "GIT-VERSION-FILE" altogether to make the logic simpler.

Patrick
Previous: Junio C HamanoNext: Patrick Steinhardt
Message 42 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.