From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Isaac Shabtay <isaac@shabtay.com>, git@vger.kernel.org
Subject: Re: Bug report: git clone with dest
Date: Fri, 05 Jan 2018 11:53:50 -0800 [thread overview]
Message-ID: <xmqqfu7kcca9.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180104040124.GA11626@sigill.intra.peff.net> (Jeff King's message of "Wed, 3 Jan 2018 23:01:25 -0500")
Jeff King <peff@peff.net> writes:
> On Wed, Jan 03, 2018 at 02:42:51PM -0800, Isaac Shabtay wrote:
>
>> Indeed interesting... this one's for the books...
>> Thanks for the patches. Any idea when these are going to make it to the
>> official Git client builds? (specifically the Windows one)
>
> 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.
> Right now we're entering release freeze for v2.16.0. We'd still take
> fixes for recent breakages there, but given the age of the problem I
> doubt it will make the cutoff. But as this is a bug-fix, it might make
> it into v2.16.1.
Yup. From the usual timeline, I'd expect this to be part of
'master' working towards 2.17 and to become a part of 2.16.x
series.
Thanks.
next prev parent reply other threads:[~2018-01-05 19:53 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 [this message]
2018-01-05 19:57 ` Jeff King
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=xmqqfu7kcca9.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=isaac@shabtay.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.