问题描述
我有一个大型项目的情况，该项目有很多模块/库及其各自的存储库.这些模块中的大多数是其他模块的依赖项，而不是项目的依赖项.现在已经到了主项目有几个子项目和许多模块共享的地步.一些依赖关系的深度超过 3-4 级.
I have a situation with a larger project that has lots of modules/libraries with their respective repos. Most of these modules are dependencies of other modules which are than dependencies of a project. And now it has come to the point where the main project has several sub-projects and many of modules are being shared. Some dependencies are more than 3-4 levels deep.
我已经读到可以在项目中更新/拉取子模块，但这仅适用于第一级子模块.假设这些子模块有自己的子模块(第 2 级)，并且一些第 1 级子模块共享相同的第 2 级子模块.此外，第二个 lvl 子模块有它们的子模块(lvl3)等.现在我应该做的是首先推送第三级所做的更改，而不是更新第二级模块中的子模块并推送这些，现在我可以进入第一级，更新和推送，最后更新我的项目子模块并推送它们.
I have read that it is possible to update/pull submodules inside of a project, but that works only for 1st level of submodules. Let's say that those submodules have their own submodules (2nd level) and that some 1st level submodules share the same 2nd level submodules. Also, 2nd lvl submodules have their submodules (lvl3), etc. Now what I should do is to firstly push changes made in 3rd level, than update submodules in 2nd level modules and push those, now I can go to 1st level, update and push, and finally update my project submodules and push those.
这现在不仅是更多的工作，但它仍然不能解决我的问题，为什么我需要这样的东西，那就是能够在对依赖于每个存储库的更改进行更改时轻松推送和拉取多个存储库其他.很容易发生团队中的某个人在 5 个 repo 中的 4 个中推送更改，而当其他成员拉除此之外的所有内容时，生产线会停止，直到发现错误.
This is now not only more work, but it still doesn't solve my problem why I need something like this and that is to be able to easily push and pull multiple repositories when changes were being made to those that dependent on each other. It can easily happen that someone in a team pushes changes in 4 of 5 repos, and when other members pull all except this one production line stops until error has been found.
对此我能做些什么?也许一些关于工作流程的建议，有没有其他人遇到过这个问题，或者 Git 中是否有一些功能可以解决这个问题.
What can I do about this? Maybe some advices about workflow, has anyone else encountered this problem or is there some feature in Git that solves this.
推荐答案
我会推荐android使用的repo工具.它足够通用，可以与任何 git 托管环境一起使用，并且不需要像子模块那样需要超级项目提交来更新子项目.
I would recommend the repo tool that android uses. It is generic enough to work with any git hosting environment, and doesn't require super-project commits to update sub-projects like submodules does.
首先，按照此处所述安装客户端:https://source.android.com/source/downloading.html#installing-repo
First, install the client as described here: https://source.android.com/source/downloading.html#installing-repo
然后创建一个清单存储库.清单是一个 xml 文件，它描述了 git 存储库位置和它们应该被签出的路径.像这样:
Then create a manifest repository. A manifest is an xml file that describes git repository locations and paths they should be checked out to. Like this:
mkdir manifests
cd manifests
git init
创建清单文件default.xml:
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="github" fetch="ssh://git@github.com" />
<default remote="github" revision="master" />
<project name="git/git.git" path="git" />
<project name="libgit2/libgit2.git" path="vendor/libgit2" />
</manifest>
然后添加、提交清单，然后推送到某处:
Then add, commit the manifest, and push somewhere:
git add default.xml
git commit -m "My first try at a manifest file"
git push git@github.com:myusername/manifests.git master
现在您可以使用 repo 命令了.
Now you are ready to use the repo command.
mkdir myproject
cd myproject
repo init -u git@github.com:myusername/manifests.git
repo sync -j2
您的 git 存储库将被克隆.您现在可以像往常一样在每一个中工作.在您推送到任何项目后，其他人需要做的只是 repo sync，它们将被更新到最新版本(另请参阅 repo start).
Your git repositories will be cloned. You can now work in each one like normal. After you push to any of the projects, all anyone else needs to do is a repo sync and they will be updated to the latest revision (also see repo start).
您可能需要重新组织您的项目.通常，您可能将其他模块作为子目录 (myproject/vendor/dependency).虽然您仍然可以使用 repo 维护此布局，但它会导致 git 存储库与另一个 repo 签出.使用 .gitignore 技巧可能可行，但我建议重新组织您的项目，这样存储库就不需要相互签出.
You may have to reorganize your project. Typically you might have other modules as sub-directories (myproject/vendor/dependency). While you can still maintain this layout using repo, it will cause a git repository to be checked out with another repo. With .gitignore trickery it might be workable, but I would recommend reorganizing your project so repositories do not need to be checked out within each other.
请参阅 https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.txt 获取 xml 文件中每个项目的完整说明.
See https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.txt for a complete explanation of each item in the xml file.
参见 https://source.android.com/source/using-repo.html 用于简单的命令参考.repo help 也很有用.注意:除非您使用 Gerrit，否则您应该忽略 repo upload.
See https://source.android.com/source/using-repo.html for a simple command reference. repo help is also very useful. Note: you should ignore repo upload unless you are using Gerrit.
这就像在 git 中添加远程一样.这意味着我们可以使用给定名称引用 url.
This is just like adding a remote in git. It means we can refer to the url with a given name.
默认元素指定项目的默认选项.这相当于在每个项目上添加 remote 和 revision 项.这只是节省了一些输入.
The default element specifies default options for the projects. This is equivalent of adding the remote and revision items on every project. This just saves some typing.
这是真正的工作发生的地方.repo sync 将获取名称并使用斜杠将其附加到远程.在这种情况下，远程是默认的 github，因此它将获取 url ssh://git@github.com/git/git.git.它会将项目签出到指定版本的路径 git(在这种情况下，默认为 master).随后的 repo sync 将检出最新版本(在分支的情况下).
This is where the real work is happening. repo sync will take the name and append it to the remote using a slash. In this case the remote is the default github, so it will get the url ssh://git@github.com/git/git.git. It will checkout the project to the path git at the specified revision (in this case the default is master). Subsequent repo syncs will checkout the latest revision (in the case of a branch).
这篇关于Git 中依赖的子模块、子树或其他东西?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，WP2