Hi Brice, > Le 7 févr. 2020 à 15:50, Brice Goglin <bgoglin@xxxxxxx> a écrit : > > Hello > > I don't understand why git pull --rebase --recurse-submodules fails after a git reset --hard > to the previous commit. I didn't touch the submodule, it's supposed to be clean: > > $ git clone --recursive git@xxxxxxxxxx:open-mpi/ompi.git > [...] > $ git reset --hard HEAD^ > HEAD is now at 395e2c9d8f Merge pull request #7364 from awlauria/fix_compile > $ git pull --rebase --recurse-submodules > Fetching submodule opal/mca/hwloc/hwloc2/hwloc > fatal: cannot rebase with locally recorded submodule modifications > > Why is failing here? It's failing because there is a bug in the code for 'git pull --rebase --recurse-submodules' when the current branch and its remote-tracking counterpart have no fork-point, which seem to be the situation happening here. I've just finished a patch series that fixes this bug. You can take a look at it here: https://github.com/gitgitgadget/git/pull/789. I will send it to the list shortly, and will CC you when I do. Cheers, Philippe.
