Re: [GSoC][PATCH v5 4/5] cherry-pick/revert: add --skip option

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 20, 2019, 20:09 UTC
Message-ID: <xmqqimt0m31x.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <76359a86-0eb1-dd87-c36f-7bd2df8b0ae5@gmail.com>

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

Show 6 quoted lines

>> This one, and the in_progress_advice emitted from the patch 1/5, are
>> both bad in that they make calls to advise() without guarding it
>> with an advice.* configuration variable.
>
> I'm not sure we have one for cherry-pick/revert/rebase. At the moment
> they print advice advice for a failed pick unconditionally...

Yes, 1/5 does not introduce a new problem; it just makes it worse by allowing the misdesign survive another update. The one introduced by 4/5 is genuinely new.

> ... Maybe that
> should be checking advice.resolveConflict though.

I think that is a sensible one, rather than inventing a new knob.

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