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

Junio C Hamano [off-list ref] writes:

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.