Re: [PATCH] submodule.c: Make get_superproject_working_tree() work when supermodule has unmerged changes of the submodule reference

On Mon, Sep 24, 2018 at 2:25 PM Sam McKelvie wrote: Thanks for writing a patch! I wonder if we can shorten the subject and make it a bit more concise, how about submodule: Alllow staged changes for get_superproject_working_tree or rev-parse: allow staged submodule in

[PATCH] submodule.c: Make get_superproject_working_tree() work when supermodule has unmerged changes of the submodule reference

Previously, "fatal: BUG: returned path string doesn't match cwd?" is displayed and git-rev-parse aborted. The problem is due to the fact that when a merge of the submodule reference is in progress, "git --stage —full-name ” returns three seperate entries for the submodule