![]() The weird part here is that the mentioned commit for the submodule going wrong is NOT the commit the submodule is actually one! It's on a different commit (a newer one), as shown when I do git log in the affected submodule: commit c374f672a8ac8fc5d8f312a7cf75785c96ca5763 (HEAD -> master, origin/master, origin/HEAD)Ĭommit 99f672b772fa876a790b86d6900191fd3eba1d3eīut whatever I do, git submodule update and then pull in the affected submodule, git does NOT recongize ANYTHING in it anymore.I did this with the Alien Blaster Recolor which was on sale for 250Atoms a few months ago. Git submodule status shows the following: e773ebc7904dd5f695bfa56880bd0874207d57be source/externals/. weirdly enough THAT is what brings git around and everything works again.Īnyone got any idea what could cause this? Sorry for the super long post, tried to give as much context as possible. cloning the submodule in a different unrelated directory, changing, committing and then pushing something (anything really), and then doing git pull in my project. ![]() deleting the whole project and re-cloning.But when I do git checkout master and then git pull to get my changes back, doing git status in the main directory still shows no changes for that submodule. It brings the affected submodule back to the commit it was on before things went wrong. Trying git submodule update doesn't fix anything. And when I add, commit and push the changes in my submodule, git no longer recognizes that the submodule now is on a different commit. ![]() But when I do the same in the main project, git no longer says that there is modified content in that submodule. When I go into an affected submodule's directory and hit git status there, git sees the changes. After working like this for a period of time (usually a day or two), git suddenly stops recognizing changes in one or more submodules. This works fine, until suddenly it doesn't anymore. Modified: source/externals/XXX (new commits) Then, in the main project, git will notice I am now on a different commit: C:\blabla>git status I go into the dirty submodule, add, commit and push the changes. No changes added to commit (use "git add" and/or "git commit -a") Modified: source/externals/XXX (modified content) (commit or discard the untracked or modified content in submodules) " to discard changes in working directory) Your branch is up to date with 'origin/master'. When I change stuff in my submodules, and do git status, git recognizes this and says something like: C:\blabla>git status The submodules are my own work that I share between my projects (so I own and maintain them).Ĭloning this is straightforward: git clone submodule update -initĮverything works for a while. The directory structure looks something like this: source I have a C++ git project with a bunch of submodules.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |