Re: fatal: cannot rebase with locally recorded submodule modifications

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Nov 13, 2020, 23:47 UTC
Message-ID: <20D6104D-CA02-4CE4-A1C0-2F9386DEDA3B@gmail.com>
In-Reply-To: <660c39af-d0f2-5e4c-66a0-5c78b646b023@free.fr>

Hi Brice,

Show 16 quoted lines

> Le 7 févr. 2020 à 15:50, Brice Goglin <bgoglin@free.fr> 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@github.com: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.