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

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 2, 2018, 06:53 UTC
Message-ID
<nycvar.QRO.7.76.6.1805020850400.73@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqr2muwvvq.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 2 May 2018, Junio C Hamano wrote:
Show 18 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > So the problem you found is not a problem with *my* branch, of course, as
> > I did not fork off of ...
> 
> Correct; there is no blame on you with the choice of the base.  It
> was my mistake that I didn't check if the series could be queueable
> on the maintenance track that is one release older than the current
> 'maint'.
> 
> As I wrote elsewhere, for a low-impact and ralatively old issue like
> this, it is OK for a fix to use supporting code that only exists in
> more recent codebase and become unmergeable to anything older than
> the concurrent 'maint' track as of the time when the fix is written.
> Even though it is sometimes nicer if the fix were written to be
> mergeable to codebase near the point where the issue originates, it
> is often not worth doing so if it requires bending backwards to
> refrain from using a newer and more convenient facility.

So do you want me to clean up the backporting branches? I mean, we could easily fix that bug for the release trains v2.13.x - v2.16.x... Of course I do not propose to release them *now*, but if you find that another critical bug fix necessitates maintenance releases anyway, *and* if the branch ages well in `master`, you could simply merge them at that time.

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 16 in “What's cooking in git.git (Apr 2018, #04; Mon, 30)”
  1. Junio C HamanoApr 30, 2018
  2. SZEDER GáborApr 30, 2018
  3. Johannes SchindelinMay 1, 2018
  4. Junio C HamanoMay 2, 2018
  5. Johannes SchindelinMay 2, 2018
  6. Junio C HamanoMay 2, 2018
  7. Junio C HamanoMay 2, 2018
  8. js/no-pager-shorthand [was: What's cooking in git.git (Apr 2018, #04; Mon, 30)]Johannes Sixt, Apr 30, 2018
  9. Johannes SchindelinMay 1, 2018
  10. Johannes SixtMay 1, 2018
  11. Eric SunshineMay 1, 2018
  12. Junio C HamanoMay 2, 2018
  13. Ævar Arnfjörð BjarmasonMay 1, 2018
  14. Brandon WilliamsMay 2, 2018
  15. Elijah NewrenMay 4, 2018
  16. Junio C HamanoMay 7, 2018

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.