On Mon, Jan 8, 2018 at 1:08 PM, Per Cederqvist <cederp@xxxxxxxxx> wrote: > I have a situation where I have switched a directory from being a > subdirectory to being a submodule. I then try to cherry-pick a commit > from a taskbranch that was made before the switch to the master > branch. The commit touches a file outside the subdirectory/submodule. > Yet "git cherry-pick" fails with this error message: > >> error: could not apply 78c403e... Add a project feature >> hint: after resolving the conflicts, mark the corrected paths >> hint: with 'git add <paths>' or 'git rm <paths>' >> hint: and commit the result with 'git commit' > > I can resolve the situation by running "git add libfoo && git > cherry-pick --continue". The generated commit contains no changes to > "libfoo". > > I don't understand why I need to manually add libfoo, as the commit > I'm cherry-picking doesn't touch anything in libfoo. > > The script below can reproduce the issue. Tested with git 2.15.1, > 2.14.0 and 2.8.0, all with the same result. > > Is this a bug in "git cherry-pick"? Could you please test with github.com/git/git/commit/c641ca67072946f95f87e7b21f13f3d4e73701e3 included? (See its parent commit, for the test) >From my cursory read that commit is the issue addressed in that commit.
