FYI, this was a git bug that will be fixed soon (the range of commits being rebased was wrong).
https://lore.kernel.org/git/pull.789.git.1605314085.gitgitgad...@gmail.com/T/#t https://lore.kernel.org/git/20d6104d-ca02-4ce4-a1c0-2f9386ded...@gmail.com/T/#t Brice Le 07/02/2020 à 10:27, Brice Goglin a écrit : > > Hello > > I have a git submodule issue that I don't understand. > > PR#7367 was initially on top of PR #7366. When Jeff merged PR#7366, I > rebased my #7367 with git prrs and got this error: > > $ git prrs origin master > From https://github.com/open-mpi/ompi > * branch master -> FETCH_HEAD > Fetching submodule opal/mca/hwloc/hwloc2/hwloc > fatal: cannot rebase with locally recorded submodule modifications > > I didn't touch the hwloc submodule as far as I can see. The hwloc > submodule also didn't change in origin/master between before and after > the rebasing. > > $ git submodule status > 38433c0f5fae0b761bd20e7b928c77f3ff2e76dc opal/mca/hwloc/hwloc2/hwloc > (hwloc-2.1.0rc2-33-g38433c0f) > opal/mca/hwloc/hwloc2/hwloc $ git status > HEAD detached from f1a2e22a > nothing to commit, working tree clean > > I am not sure what's this "HEAD detached ..." is doing here. > > I seem to be able to reproduce the issue in my master branch by doing > "git reset --hard HEAD^". git prrs will then fail the same. > > I worked around the issue by manually reapplying all commits from my > PR on top of master with git cherry-pick, but I'd like to understand > what's going on. It looks like my submodule is clean but not clean > enough for a rebase? > > Thanks > > Brice > > > > Le 07/01/2020 à 18:02, Jeff Squyres (jsquyres) via devel a écrit : >> We now have two PRs pending that will introduce the use of Git submodules >> (and there are probably more such PRs on the way). At last one of these >> first two PRs will likely be merged "Real Soon Now". >> >> We've been talking about using Git submodules forever. Now we're just about >> ready. >> >> ************************************** >> *** DEVELOPERS: THIS AFFECTS YOU!! *** >> ************************************** >> >> You cannot just "clone and build" any more: >> >> ----- >> git clone g...@github.com:open-mpi/ompi.git >> cd ompi && ./autogen.pl && ./configure ... >> ----- >> >> You will *have* to initialize the Git submodule(s) -- either during or after >> the clone. *THEN* you can build Open MPI. >> >> Go read this wiki: https://github.com/open-mpi/ompi/wiki/GitSubmodules >> >> May the force be with us! >>
