Re: [PATCH 1/2] t3507: pin CHERRY_PICK_HEAD absence for a conflicting --no-commit

From: Aleksei Sviridkin <f@lex.la>
Date: Sep 5, 2026, 17:13 UTC
Message-ID: <20260905171345.34749-1-f@lex.la>
In-Reply-To: <6d9595fc-6dc0-4bbc-b060-b34d782c6215@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

> I don't follow this at all - where is the existing check that
> CHERRY_PICK_HEAD does not exist when "git cherry-pick --no-commit"
> stops for conflicts?

There is none. That was my error: the guard in do_pick_commit() is shared, but the suite only exercises the clean pick. v3 adds test_ref_missing CHERRY_PICK_HEAD to the conflicting advice test, the helper you pointed at.

$ 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.

Re: [PATCH 1/2] t3507: pin CHERRY_PICK_HEAD absence for a conflicting --no-commit | The Git List