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
Jay Soffian <jaysoffian@gmail.com>
Date
Oct 6, 2011, 17:21 UTC
Message-ID
<CAG+J_Dzh2Njjwykt-f4w_YqpftrJEpQfUW2OvSRs_MSPcNFQnw@mail.gmail.com>
In-Reply-To
<7vty7m12b2.fsf@alter.siamese.dyndns.org>
On Thu, Oct 6, 2011 at 1:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> I think do_recursive_merge() would die() when the merge cannot even start
> (i.e. the local changes after the cherry-pick exits are the ones from the
> time before such a failed cherry-pick started), but I suspect that the
> other codepath uses try_merge_command() to drive strategies other than
> recursive and it does not die() there in such a case. Can you make sure
> this patch is sufficient in such a case as well?
Why does recursive die with a dirty tree but not other strategies?

For that matter, why does revert.c have it's own implementation of recursive instead of just calling try_merge_command("recursive", ...)?

j.
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 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.