How to update git submodule who's history was rewritten

Question

Say I have a git submodule already setup, and the upstream commit history has rewritten (for example a rebase squash was preformed).

Say the commit my submodule head is set to no longer exits. So I want to set the head hash submodule's repo's head. How do I do that?

Just as a note, the commit your submodule's head was set to does still exist. If you want to prevent it being garbage-collected (after ninety days or so) you can add your own reference to it with a tag or `merge -s ours`ing it into a `preserved-history` branch or however you want to do it. — jthill, Oct 14 '13 at 23:16

score 2 · Accepted Answer · edited May 23 '17 at 12:10

2

You can simply go in the submodule, do a git fetch, and checkout the HEAD you need.

cd mysubmodule
git fetch
git checkout origin/abranch

Then you go back to the parent repo, add and commit that new submodule SHA1 entry.

git submodule update --remote

would be enough.

edited May 23 '17 at 12:10

Community

answered Oct 14 '13 at 20:42

VonC

1 Answers1