From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Dec 2021, #06; Mon, 27)
Date: Thu, 30 Dec 2021 15:56:42 -0800 [thread overview]
Message-ID: <xmqqk0flmyth.fsf@gitster.g> (raw)
In-Reply-To: CABPp-BFR29S-Pwq9LZEOjaCxozTV9mkUBpd2SLGwh7jNW+On4w@mail.gmail.com
Elijah Newren <newren@gmail.com> writes:
> On Tue, Dec 28, 2021 at 3:27 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> * ds/sparse-checkout-malformed-pattern-fix (2021-12-25) 4 commits
>> (merged to 'next' on 2021-12-27 at c410caf527)
>> + fixup! sparse-checkout: fix OOM error with mixed patterns
>> + sparse-checkout: refuse to add to bad patterns
>> + sparse-checkout: fix OOM error with mixed patterns
>> + sparse-checkout: fix segfault on malformed patterns
>>
>> Certain sparse-checkout patterns that are valid in non-cone mode
>> led to segfault in cone mode, which has been corrected.
>>
>> Will merge to 'master'.
>> source: <pull.1069.v4.git.1639671222.gitgitgadget@gmail.com>
>
> Eek, this was merged with the "fixup!" commit to next. I think that
> was a mistake...but what's the plan now? Merge to master as-is...or
> revert from next, then squash, then re-merge?
If the fixup turns out to be unnecessary (which I suspect may become
the case), we can just revert it at the tip the topic branch.
next prev parent reply other threads:[~2021-12-30 23:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-28 0:16 What's cooking in git.git (Dec 2021, #06; Mon, 27) Junio C Hamano
2021-12-28 13:31 ` ab/cat-file (was: What's cooking in git.git (Dec 2021, #06; Mon, 27)) Ævar Arnfjörð Bjarmason
2021-12-28 13:40 ` hn/reftable-coverity-fixes " Ævar Arnfjörð Bjarmason
2021-12-28 14:35 ` ab/ambiguous-object-name " Ævar Arnfjörð Bjarmason
2021-12-28 15:20 ` ab/only-single-progress-at-once " Ævar Arnfjörð Bjarmason
2021-12-28 17:42 ` What's cooking in git.git (Dec 2021, #06; Mon, 27) Elijah Newren
2021-12-30 23:56 ` Junio C Hamano [this message]
2022-01-04 22:20 ` Glen Choo
2022-01-10 18:41 ` Junio C Hamano
2022-01-01 14:01 ` tl/ls-tree-oid-only (was: What's cooking in git.git (Dec 2021, #06; Mon, 27)) Teng Long
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=xmqqk0flmyth.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@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).