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

Re: git-cherry-pick problem - directory not touched by commit is marked "added by us"

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 7, 2010, 03:35 UTC
Message-ID
<7vzl4qegdm.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7v4omyfv6h.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 8 quoted lines
> What "cherry-pick" internally does is to run:
>
>     git merge-recursive 301a^ -- HEAD 301a
>
> That is, "We are at HEAD; consolidate the change since 301a^ to 301a into
> our state, and leave the result in the index and the work tree".  Then it
> commits the result.  One thing to try is to see if this gives the same
> kind of breakage.
There actually is another possibility; we used to run inside "cherry-pick"
    git merge-resolve 301a^ -- HEAD 301a

instead. The request is the same but it uses a different algorithm, so if one fails and one succeeds, that might give us a better clue to figure out what is going on.

Previous: Junio C HamanoNext: Hakim Cassimally
Message 5 of 6 in “git-cherry-pick problem - directory not touched by commit is marked "added by us"”
  1. Hakim CassimallyJan 5, 2010
  2. Sam VilainJan 5, 2010
  3. Hakim CassimallyJan 6, 2010
  4. Junio C HamanoJan 7, 2010
  5. Junio C HamanoJan 7, 2010
  6. Hakim CassimallyJan 8, 2010

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.