git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 0/3] Miscellaneous merge fixes

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 24, 2022, 21:09 UTC
Message-ID
<xmqqfshl5oy5.fsf@gitster.g>
In-Reply-To
<CABPp-BHcRQatt9F2Hj4ygUsS9y8_BmfN3K=YFrLEnCn+2WLz9A@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 12 quoted lines
> 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.
Previous: Elijah Newren
Message 15 of 15 in “Miscellaneous merge fixes”
  1. 0/2 Miscellaneous merge fixesElijah Newren via GitGitGadget, Aug 21, 2022
  2. 2/2 merge: avoid searching for strategies with fewer than 0 conflictsElijah Newren via GitGitGadget, Aug 21, 2022
  3. Junio C HamanoAug 21, 2022
  4. Elijah NewrenAug 22, 2022
  5. Junio C HamanoAug 22, 2022
  6. Elijah NewrenAug 23, 2022
  7. 1/2 merge: only apply autostash when appropriateElijah Newren via GitGitGadget, Aug 21, 2022
  8. Eric SunshineAug 21, 2022
  9. Elijah NewrenAug 21, 2022
  10. 0/3 Miscellaneous merge fixesElijah Newren via GitGitGadget, Aug 23, 2022
  11. 1/3 merge: only apply autostash when appropriateElijah Newren via GitGitGadget, Aug 23, 2022
  12. 2/3 merge: cleanup confusing logic for handling successful mergesElijah Newren via GitGitGadget, Aug 23, 2022
  13. 3/3 merge: small code readability improvementElijah Newren via GitGitGadget, Aug 23, 2022
  14. Elijah NewrenAug 23, 2022
  15. Junio C HamanoAug 24, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.