From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
Date: Mon, 11 Jun 2018 18:30:01 -0400 [thread overview]
Message-ID: <20180611223000.GA29549@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqmuw1asd1.fsf@gitster-ct.c.googlers.com>
On Mon, Jun 11, 2018 at 03:08:42PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano wrote:
> >
> >> * jk/index-pack-maint (2018-06-01) 2 commits
> >> (merged to 'next' on 2018-06-04 at c553a485e8)
> >> + index-pack: handle --strict checks of non-repo packs
> >> + prepare_commit_graft: treat non-repository as a noop
> >>
> >> "index-pack --strict" has been taught to make sure that it runs the
> >> final object integrity checks after making the freshly indexed
> >> packfile available to itself.
> >>
> >> Will cook in 'next'.
> >
> > This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I
> > don't know if we'd want to consider it for v2.18 or not (it should be
> > able to be applied independently from the first).
>
> I gave the topic -maint suffix, but I'd need a little fix-up patch
> on top to actually make it mergeable to the maintenance track. With
> that, let's merge it to 'master' before v2.18 final happens and then
> also to 'maint'.
Thanks, your fixup looks good.
-Peff
next prev parent reply other threads:[~2018-06-11 22:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 13:57 What's cooking in git.git (Jun 2018, #02; Mon, 4) Junio C Hamano
2018-06-04 14:12 ` Jeff King
2018-06-11 22:08 ` Junio C Hamano
2018-06-11 22:30 ` Jeff King [this message]
2018-06-11 22:35 ` Junio C Hamano
2018-06-04 14:18 ` SZEDER Gábor
2018-06-04 14:50 ` Jeff King
2018-06-04 14:26 ` Luke Diamand
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=20180611223000.GA29549@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).