From: Derrick Stolee <stolee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)
Date: Mon, 20 Aug 2018 14:14:20 -0400 [thread overview]
Message-ID: <800850d1-1880-2a8a-f5d5-7d0593787142@gmail.com> (raw)
In-Reply-To: <xmqqlg91aqzh.fsf@gitster-ct.c.googlers.com>
On 8/20/2018 1:26 PM, Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>>> Usually, I refrain from merging larger topics in 'next' down to
>>> 'master' when we get close to -rc0, but I am wondering if it is
>>> better to merge all of them to 'master', even the ones on the larger
>>> and possibly undercooked side, expecting that we collectively spend
>>> effort on hunting and fixing bugs in them during the pre-release
>>> freeze period. If we were to go that route, I'd want everybody's
>>> buy-in and I'll promise to ignore any shiny new toys that appear on
>>> list that are not regression fixes to topics merged to 'master'
>>> since the end of the previous cycle to make sure people are not
>>> distracted.
>> Based on what I see in 'next' (midx, range-diff, etc), I quite like
>> this idea.
> The comment above was about the ones that was marked as "Will merge
> to 'master'" that are in 'next', not the ones marked as "Will cook
> in 'next'", like the midx ones.
>
> I am not worried about range-diff, as I do not think it came close
> enough to the core-ish code to break other things; the potential
> damage is fairly isolated and the worst would be that we'd realize
> that we shipped with a new command that was buggy after the release,
> which is not the end of the world. 'midx' and 'reachable' are quite
> different stories, as bugs in them would in the worst case lead to
> an immediate and unrecoverable repository corruption.
>
> So I am still on the fence, even though I am leaning toward merging
> them down to 'master'.
I'm happy to wait until 2.19 is cut for ds/multi-pack-index to merge
down. I sent a new series today [1] that improves the series and
corrects some bugs I found while making the full Git test suite work
when writing a multi-pack-index on every repack. Nothing was
"unrecoverable repository corruption," but I understand the concern
there. Making the safest decision is probably the best decision.
I'm happy to contribute to a "pre-2.19 bug bash" after you merge things
into master.
Thanks,
-Stolee
[1]
https://public-inbox.org/git/20180820165124.152146-1-dstolee@microsoft.com/T/#u
[PATCH 0/9] multi-pack-index cleanups
next prev parent reply other threads:[~2018-08-20 18:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-17 22:44 What's cooking in git.git (Aug 2018, #04; Fri, 17) Junio C Hamano
2018-08-18 6:29 ` Duy Nguyen
2018-08-18 6:59 ` Jonathan Nieder
2018-08-20 17:26 ` Junio C Hamano
2018-08-20 18:14 ` Derrick Stolee [this message]
2018-08-18 9:34 ` Christian Couder
2018-08-18 11:34 ` Ævar Arnfjörð Bjarmason
2018-08-18 12:54 ` Christian Couder
2018-08-18 11:10 ` Ævar Arnfjörð Bjarmason
2018-08-20 10:23 ` Phillip Wood
2018-08-20 17:44 ` Eric Sunshine
2018-08-20 19:36 ` pw/rebase-i-author-script-fix, was " Johannes Schindelin
2018-08-20 18:11 ` Stefan Beller
2018-08-20 21:32 ` Junio C Hamano
2018-08-20 18:19 ` Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=800850d1-1880-2a8a-f5d5-7d0593787142@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).