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

Re: [PATCH] revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 6, 2011, 21:49 UTC
Message-ID
<7v4nzlzt6u.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAG+J_Dx0W0oRL-MkoZSGuOfmUNCqmMRUigmgND_0o7kbKppu1Q@mail.gmail.com>
Jay Soffian <jaysoffian@gmail.com> writes:
> For that matter, I don't see how to distinguish "the merge did not
> even start" from "the merge had conflicts" when using
> try_merge_command().

I suspect you figured it out by now (sorry I have been tending other topics and general project maintenance issues), but in case you haven't, the exit values from the strategy backends are returned straight back to the caller. The strategy backends are supposed to exit with 1 when they left the conflicts, and 2 when they punted and did not touch the index nor the working tree.

Previous: Jay Soffian
Message 7 of 7 in “revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so”
  1. revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian, Oct 6, 2011
  2. Junio C HamanoOct 6, 2011
  3. Jay SoffianOct 6, 2011
  4. Junio C HamanoOct 6, 2011
  5. Jay SoffianOct 6, 2011
  6. Jay SoffianOct 6, 2011
  7. Junio C HamanoOct 6, 2011

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.