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

Re: Bug report: git clone with dest

From
Jeff King <peff@peff.net>
Date
Jan 5, 2018, 19:57 UTC
Message-ID
<20180105195705.GA5217@sigill.intra.peff.net>
In-Reply-To
<xmqqfu7kcca9.fsf@gitster.mtv.corp.google.com>
On Fri, Jan 05, 2018 at 11:53:50AM -0800, Junio C Hamano wrote:
Show 20 quoted lines
> > They haven't even been reviewed yet. If they get good feedback, then the
> > maintainer will pick them up, then merge them to 'next', and then
> > eventually to 'master', after which they'd become part of the next
> > major release. For a pure bug-fix, it may instead go to 'maint' and
> > become part of the next minor release.
> 
> Even a pure bug-fix, unless it is something no longer needed on the
> 'master' front, goes thru 'pu'->'next'->'master' avenue first, and
> is recorded in the RelNotes with the notes like "(merge d45420c1c8
> jk/abort-clone-with-existing-dest later to maint)" when it happens.
> 
> 	side note: in fact "grep -e 'later to maint' RelNotes" is
> 	how I remind myself what to merge down to 'maint'; the
> 	actual procedure is a bit more involved (those interested in
> 	the details can find the 'ML' script on the 'todo' branch;
> 	its name stands for 'merge later')
> 
> Later, after not hearing from people that the "fix" breaks things,
> the topic is also mreged to 'maint' and becomes part of the next
> minor release.

Out of curiosity, did this change at some point? I thought the process used to be to merge to maint, and then pick up topics in master by merging maint to master.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 19 in “Bug report: git clone with dest”
  1. Isaac ShabtayJan 3, 2018
  2. Jeff KingJan 3, 2018
  3. Isaac ShabtayJan 3, 2018
  4. Johannes SchindelinJan 4, 2018
  5. Isaac ShabtayJan 5, 2018
  6. Johannes SchindelinJan 5, 2018
  7. Isaac ShabtayJan 5, 2018
  8. Johannes SchindelinJan 5, 2018
  9. Junio C HamanoJan 5, 2018
  10. Jeff KingJan 5, 2018
  11. Johannes SchindelinJan 5, 2018
  12. Jeff KingJan 4, 2018
  13. Junio C HamanoJan 5, 2018
  14. Jeff KingJan 5, 2018
  15. Junio C HamanoJan 5, 2018
  16. Jeff KingJan 5, 2018
  17. Junio C HamanoJan 5, 2018
  18. Jeff KingJan 6, 2018
  19. Johannes SchindelinJan 5, 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.