git/list[1] front-page[2] threads[3] people[4] search[5] about
 

fatal: cannot rebase with locally recorded submodule modifications

From
BGBrice Goglin <bgoglin@free.fr>
Date
Feb 7, 2020, 20:50 UTC
Message-ID
<660c39af-d0f2-5e4c-66a0-5c78b646b023@free.fr>
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?
$ git submodule status
 38433c0f5fae0b761bd20e7b928c77f3ff2e76dc opal/mca/hwloc/hwloc2/hwloc (hwloc-2.1.0rc2-33-g38433c0f)
(that's expected)

$ git status HEAD detached at 38433c0f nothing to commit, working tree clean

Thanks
Brice
Next: Shourya Shukla
Message 1 of 4 in “fatal: cannot rebase with locally recorded submodule modifications”
  1. Brice GoglinFeb 7, 2020
  2. Shourya ShuklaFeb 7, 2020
  3. Philippe BlainNov 14, 2020
  4. Philippe BlainNov 13, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.