{"thread":{"id":"47156","subject":"Bug: cherry-pick & submodule","startedAt":"2017-11-10T16:09:33Z","lastAt":"2017-11-10T16:09:33Z","messageCount":1,"participants":["Ефимов Василий"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"332187","messageId":"c48bf9f3-10b2-dfac-a207-74a57e66b848@ispras.ru","threadId":"47156","inReplyTo":null,"subject":"Bug: cherry-pick & submodule","fromName":"Ефимов Василий","fromEmail":"real@ispras.ru","sentAt":"2017-11-10T16:00:25Z","receivedAt":"2017-11-10T16:09:33Z","isPatch":false,"sender":{"key":"real@ispras.ru","avatar":null},"body":"I faced an unexpected behaviour during cherry-picking\na commit to a branch with a submodule.\n\nGit graph:\n\nA -- B [master]\n  \\\n   `- C -- D [test]\n\nBoth branches have a file with name `a_file`.\nIt has been added by commit A.\nCommits B and C add a folder with name `a_submodule` to the respective \nbranches.\nCommit C does it regularly by adding a file with name `a_submodule/content`.\nCommit B adds a submodule with name `a_submodule`.\nCommit D only modifies `a_file`.\nNote that `a_file` and `a_submodule` are not related.\n\n[repo]\n   |- a_file\n   `- a_submodule\n\nWhen I trying to cherry pick commit D on commit B, I got\na conflict with `a_submodule`. Changes of `a_file` are\nsuccessfully cherry-picked.\n\nI expected, that there would be no conflicts.\n\nA bash script reproducing the bug is attached.\n\nVasily.\n"}]}