If you can use symlinks (e.g. you are not using Windows), then you can set up core and core.php like this: # “base” repository layout: core/ core.app # each app repository layout: base/ core/ core.php core -> base/core/ core.php -> base/core.php app/ In each app repository, the base/ directory is either a submodule that uses … Read more
There are several approaches for detect and discard inclusion of the project, which has already be included in some other parts of the main project. Check project’s target existence The simplest pattern for single inclusion of subproject is checking existence of some subproject’s target: # When include ‘C’ subproject if(NOT TARGET library_C) add_subdirectory(C) endif() (Here … Read more
With git 2.8 (Q12016), you will be able to initiate the fetch of submodules… in parallel! See commit fbf7164 (16 Dec 2015) by Jonathan Nieder (artagnon). See commit 62104ba, commit fe85ee6, commit c553c72, commit bfb6b53, commit b4e04fb, commit 1079c4b (16 Dec 2015) by Stefan Beller (stefanbeller). (Merged by Junio C Hamano — gitster — in … Read more
What went wrong Where you went wrong is doing the $ git add . That adds everything, so also foo/bar, to the index of the current repository (ready to be committed thus). Correct way If you just don’t do that and continue with $ git submodule add https://github.com/CarloWood/XYZ.git foo/bar then that should work; this would … Read more
So I just found a command that I think i can use to detect the “merge_head” git rev-parse -q –verify MERGE_HEAD If rev-parse returns a hash that means we are currently in a merge state. I can use that to bypass this logic. But will wait for some better advice from more experienced individuals.
The best approach is to do subtree merging. First, remove the submodules and related configuration from your superproject; Edit your .gitmodules file to remove the submodules affected, or delete the file entirely if you intend to merge all submodules. Delete the submodule directories as well. Next, add the submodule repositories as proper remotes to your … Read more
Today there’s a better way of doing this: git subtree See this answer.
After a long walk on the internet, I found out that you can achieve what you want by writing directly in the git index and create the “gitlink” file type. git update-index [–add] –cacheinfo 160000 <subrepo commit hash> <submod path> Also do not forget to write the subrepo in .gitmodules (declare the external path, mostly).
It seems you can use relative URLs for submodules. From git help submodules: COMMANDS add […] <repository> is the URL of the new submodule’s origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject’s origin repository So, if you follow the same … Read more