Re: "git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

2018-09-24 Thread Stefan Beller
On Mon, Sep 24, 2018 at 10:59 AM Sam McKelvie wrote: > > I experienced this problem using git 2.17.1; however, from inspection of the > next branch, function get_superproject_working_tree() in submodule.c has not > changed in 2 years. > > I believe the problem is related to the fact that when a

"git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

2018-09-24 Thread Sam McKelvie
I experienced this problem using git 2.17.1; however, from inspection of the next branch, function get_superproject_working_tree() in submodule.c has not changed in 2 years. I believe the problem is related to the fact that when a merge of the submodule reference is in progress, "git --stage