On Thu, Sep 27, 2018 at 11:12 AM Sam McKelvie <sam...@gmail.com> wrote: > > Invoking 'git rev-parse --show-superproject-working-tree' exits with > > "fatal: BUG: returned path string doesn't match cwd?" > > when the superproject has an unmerged entry for the current submodule, > instead of displaying the superproject's working tree. > > The problem is due to the fact that when a merge of the submodule reference > is in progress, "git ls-files --stage —full-name <submodule-relative-path>” > returns three seperate entries for the submodule (one for each stage) rather > than a single entry; e.g., > > $ git ls-files --stage --full-name submodule-child-test > 160000 dbbd2766fa330fa741ea59bb38689fcc2d283ac5 1 submodule-child-test > 160000 f174d1dbfe863a59692c3bdae730a36f2a788c51 2 submodule-child-test > 160000 e6178f3a58b958543952e12824aa2106d560f21d 3 submodule-child-test > > The code in get_superproject_working_tree() expected exactly one entry to > be returned; this patch makes it use the first entry if multiple entries > are returned. > > Test t1500-rev-parse is extended to cover this case. > > Signed-off-by: Sam McKelvie <sam...@gmail.com>
Thanks for following up, this patch is Reviewed-by: Stefan Beller <sbel...@google.com> Thanks for adding the test as well! Stefan
