git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Isaac Shabtay <isaac@shabtay.com>, git@vger.kernel.org
Subject: Re: Bug report: git clone with dest
Date: Fri, 5 Jan 2018 14:57:05 -0500	[thread overview]
Message-ID: <20180105195705.GA5217@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqfu7kcca9.fsf@gitster.mtv.corp.google.com>

On Fri, Jan 05, 2018 at 11:53:50AM -0800, Junio C Hamano wrote:

> > 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

  reply	other threads:[~2018-01-05 19:57 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-03 20:59 Bug report: git clone with dest Isaac Shabtay
2018-01-03 22:28 ` Jeff King
2018-01-03 22:44   ` Isaac Shabtay
2018-01-04 23:20     ` Johannes Schindelin
2018-01-05  5:11       ` Isaac Shabtay
2018-01-05 10:33         ` Johannes Schindelin
2018-01-05 18:55           ` Isaac Shabtay
2018-01-05 20:22             ` Johannes Schindelin
2018-01-05 20:38               ` Junio C Hamano
2018-01-05 20:44               ` Jeff King
2018-01-05 21:39                 ` Johannes Schindelin
     [not found]   ` <CAK2k7nQcY+QQBfda6CHM8tFo3i4XX2tXxHKv73t6SJ4rRvWo1w@mail.gmail.com>
2018-01-04  4:01     ` Jeff King
2018-01-05 19:53       ` Junio C Hamano
2018-01-05 19:57         ` Jeff King [this message]
2018-01-05 20:45           ` Junio C Hamano
2018-01-05 20:52             ` Jeff King
2018-01-05 22:37               ` Junio C Hamano
2018-01-06  4:43                 ` Jeff King
2018-01-05 21:06         ` Johannes Schindelin

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=20180105195705.GA5217@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=isaac@shabtay.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).