From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 0/3] Miscellaneous merge fixes
Date: Wed, 24 Aug 2022 14:09:06 -0700 [thread overview]
Message-ID: <xmqqfshl5oy5.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BHcRQatt9F2Hj4ygUsS9y8_BmfN3K=YFrLEnCn+2WLz9A@mail.gmail.com> (Elijah Newren's message of "Mon, 22 Aug 2022 20:03:00 -0700")
Elijah Newren <newren@gmail.com> writes:
> On Mon, Aug 22, 2022 at 7:42 PM Elijah Newren via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> While working on other things, I noticed a few miscellaneous issues in
>> builtin/merge.c. Here's a few small fixes to address them.
>
> Sorry, forgot to include a high level summary:
>
> Changes since v1:
> * Fix play/apply typo, spotted by Eric
> * Almost completely rewrote patch 2; it's now merely a "code cleanup"
> * Added a third patch, just a very minor code simplification
I was skeptical about patch 2 before I saw it, but removal of
!merge_was_ok in the loop condition alone is very well worth it.
As to patch 3, I do not think it makes huge difference either way,
but I've queued it anyway.
Thanks.
prev parent reply other threads:[~2022-08-24 21:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-21 4:38 [PATCH 0/2] Miscellaneous merge fixes Elijah Newren via GitGitGadget
2022-08-21 4:38 ` [PATCH 1/2] merge: only apply autostash when appropriate Elijah Newren via GitGitGadget
2022-08-21 4:52 ` Eric Sunshine
2022-08-21 5:18 ` Elijah Newren
2022-08-21 4:38 ` [PATCH 2/2] merge: avoid searching for strategies with fewer than 0 conflicts Elijah Newren via GitGitGadget
2022-08-21 18:05 ` Junio C Hamano
2022-08-22 15:00 ` Elijah Newren
2022-08-22 16:19 ` Junio C Hamano
2022-08-23 1:18 ` Elijah Newren
2022-08-23 2:42 ` [PATCH v2 0/3] Miscellaneous merge fixes Elijah Newren via GitGitGadget
2022-08-23 2:42 ` [PATCH v2 1/3] merge: only apply autostash when appropriate Elijah Newren via GitGitGadget
2022-08-23 2:42 ` [PATCH v2 2/3] merge: cleanup confusing logic for handling successful merges Elijah Newren via GitGitGadget
2022-08-23 2:42 ` [PATCH v2 3/3] merge: small code readability improvement Elijah Newren via GitGitGadget
2022-08-23 3:03 ` [PATCH v2 0/3] Miscellaneous merge fixes Elijah Newren
2022-08-24 21:09 ` Junio C Hamano [this message]
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=xmqqfshl5oy5.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.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 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.