From: Brice Goglin <bgoglin@free.fr>
To: git@vger.kernel.org
Subject: fatal: cannot rebase with locally recorded submodule modifications
Date: Fri, 7 Feb 2020 21:50:29 +0100 [thread overview]
Message-ID: <660c39af-d0f2-5e4c-66a0-5c78b646b023@free.fr> (raw)
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 reply other threads:[~2020-02-07 20:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 20:50 Brice Goglin [this message]
2020-02-07 22:04 ` fatal: cannot rebase with locally recorded submodule modifications Shourya Shukla
2020-11-14 0:32 ` Philippe Blain
2020-11-13 23:47 ` Philippe Blain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=660c39af-d0f2-5e4c-66a0-5c78b646b023@free.fr \
--to=bgoglin@free.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).