git-submodules – Page 12

How to track untracked content?

November 13, 2022 by Tarik

You have added vendor/plugins/open_flash_chart_2 as “gitlink” entry, but never defined it as a submodule. Effectively you are using the internal feature that git submodule uses (gitlink entries) but you are not using the submodule feature itself. You probably did something like this: git clone git://github.com/korin/open_flash_chart_2_plugin.git vendor/plugins/open_flash_chart_2 git add vendor/plugins/open_flash_chart_2 This last command is the problem. … Read more

Git submodule inside of a submodule (nested submodules)

November 13, 2022 by Tarik

As mentioned in Retrospectively add –recursive to a git repo git submodule update –init –recursive should work.

git submodule tracking latest

October 25, 2022 by Tarik

Edit (2020.12.28): GitHub change default master branch to main branch since October 2020. See https://github.com/github/renaming This answer below still reflect the old naming convention. Update March 2013 Git 1.8.2 added the possibility to track branches. “git submodule” started learning a new mode to integrate with the tip of the remote branch (as opposed to integrating … Read more

How do I manage conflicts with git submodules?

October 25, 2022 by Tarik

Well, its not technically managing conflicts with submodules (ie: keep this but not that), but I found a way to continue working…and all I had to do was pay attention to my git status output and reset the submodules: git reset HEAD subby git commit That would reset the submodule to the pre-pull commit. Which … Read more

Git will not init/sync/update new submodules

October 24, 2022 by Tarik

I had this same problem – it turned out that the .gitmodules file was committed, but the actual submodule commit (i.e. the record of the submodule’s commit ID) wasn’t. Adding it manually seemed to do the trick – e.g.: git submodule add http://github.com/sciyoshi/pyfacebook.git external/pyfacebook (Even without removing anything from .git/config or .gitmodules.) Then commit it … Read more

How can I have linked dependencies in a git repo?

October 23, 2022 by Tarik

You can do this with submodules in git. In your repository, do: git submodule add path_to_repo path_where_you_want_it So, if the library’s repository had a URL of git://github.com/example/some_lib.git and you wanted it at lib/some_lib in your project, you’d enter: git submodule add git://github.com/example/some_lib.git lib/some_lib Note that this needs to be done from the top-level directory in … Read more

How to get rid of Git submodules untracked status?

October 23, 2022 by Tarik

I found this blog post to work overall. By adding the ignore = dirty option to each one of the entries in the .gitmodules file. [submodule “zen-coding-gedit3”] path = zen-coding-gedit3 url = git://github.com/leafac/zen-coding-gedit3.git ignore = dirty

Git: fatal: Pathspec is in submodule

October 22, 2022 by Tarik

Removing the directory from git and adding it again worked for me: git rm –cached directory git add directory This works if you purposefully removed the .git directory because you wanted to add directory to your main git project. In my specific case, I had git cloned an extension and ran git add . without … Read more

Empty Git submodule folder when repo cloned

October 22, 2022 by Tarik

OK I found it, needed to add –recursive when cloning the repo. So the clone command ends up as: git clone https://github.com/aikiframework/json.git –recursive Note that if you forgot the –recursive flag you can do (thanks to @Amber): git submodule update –init

Where does Git store the SHA1 of the commit for a submodule?

October 21, 2022 by Tarik

It is stored in Git’s object database directly. The tree object for the directory where the submodule lives will have an entry for the submodule’s commit (this is the so-called “gitlink”). Try doing git ls-tree master <path-to-directory-containing-submodule> (or just git ls-tree master if the submodule lives in the top-level directory).