blocks|key|2562738|text|你正在尝试完成一个叫做“子模块”的东西。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2562739|请查看了解它是如何工作的。|2562740|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

You are trying to accomplish something called a "submodule".

Please check out <a href="http://git-scm.com/book/en/v2/Git-Tools-Submodules" rel="nofollow noreferrer">Git Tools - Submodules</a> to find out how it's working.

blocks|key|2562800|text|我已经使用这种结构很长一段时间了，在外部存储库中的.gitignore中指定了子存储库目录。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2562801|它混淆了我的编辑器(PhpStorm)中的git工具，它总是想要提交给外部repo，但除此之外工作得很好。我将整个外部存储库(包括所有内部存储库)作为单个项目加载到编辑器中。这使我可以在处理内部代码库的同时，轻松地搜索和检查外部代码库中的代码。|2562802|我在Git+bash中做所有的Git操作，不管我在做什么。|2562803|子模块可能是更好的方法。我还没有时间调查他们是否可以更好地使用PhpStorm。|2562804|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

I've used that structure for quite a while, with the sub-repo directories specified in .gitignore in the outer repo.

It confuses the git tool in my editor (PhpStorm), which always wants to commit to the outer repo, but otherwise works fine. I load the whole outer repo (which includes all innner repos) as a single project in the editor. That allows me to easily search for and examine code in the outer repo while working on an inner one.

I do all Git operations from Git bash in whatever repo I'm working on.

Submodules might be a better approach. I haven't had time to investigate whether they would work better with PhpStorm.

blocks|key|4354650|text|是的，您可以使用此模式。我过去曾使用它将外部SVN引入到git-svn克隆中。子模块现在可能可以更好地处理这一点，但当时并不适合我的需求。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4354651|您需要将以下内容添加到repo1/.git/info/exclude中，以确保repo2中的更改不会与repo1混淆：|4354652|repo2|code-block|syntax|javascript|4354653|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

Yes, you can use this pattern. I've used it in the past to bring in SVN externals into a git-svn clone. Submodules may handle this better now, but didn't suit my needs at the time.

You'll want to add the following to repo1/.git/info/exclude to ensure changes in repo2 don't mix with repo1:

<pre><code>repo2
</code></pre>

blocks|key|659998|text|我也同意Ronald+William's+answer的观点。Git子模块的主要目的是更新从外部获取的代码，如果更新修改了代码，则不需要提交更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|659999|Composer包管理系统也做同样的事情。实际上，they+don't+recommend+to+commit+those+changes+either并忽略项目根目录下.gitignore中的供应商文件夹。|style|BOLD|660000|如果你试图提交这个文件夹，那将是一场噩梦，因为一些vendor/some_repo可能是开发版本的，因此它们有一个.git文件夹，导致所有这些包成为子模块，即使你没有用git+submodule+add添加它们。如果您在嵌套的.git存储库中修改some_file，您可能会看到如下所示：|CODE|660001|~/project_root+$+git+status
#+On+branch+master
#+Changes+not+staged+for+commit:
#+++(use+"git+add+<file>..."+to+update+what+will+be+committed)
#+++(use+"git+checkout+--+<file>..."+to+discard+changes+in+working+directory)
#+++(commit+or+discard+the+untracked+or+modified+content+in+submodules)
#
#++++modified:+++vendor/nested_repo+(modified+content)|code-block|syntax|javascript|660002|请注意modified+content+in+submodules条目，并且您在输出中看不到some_file名称。相反，您会看到(modified+content)通知，因为root_project+.git将供应商/nested_repo视为一个子模块，而不会跟踪该文件夹中的单个文件。|660003|如果运行git+add+--all，则在vendor/nested_repo中提交更改之前不会得到任何结果，并且只有在此之后才能在根存储库中提交更改。|660004|不要这样做。相反，如果你想将你的项目作为一个完整的.git存储库(任何，不仅仅是Composer构建的存储库)，这有时是非常方便的，在初始提交之前将以下条目添加到根.gitignore+：|660005|.git
!/.git|660006|不幸的是，要使整个配方起作用，您需要为每个嵌套存储库运行git+add命令，以便稍后单独修改。请注意，存储库路径中的尾随斜杠是一个必须为的。|660007|~/project_root+$+git+add+vendor/some_repo/+vendor/another_repo/|660008|然后在vendor/some_repo中修改some_file，看看区别：|660009|~/project_root+$+git+status
#+On+branch+master
#+Changes+not+staged+for+commit:
#+++(use+"git+add+<file>..."+to+update+what+will+be+committed)
#+++(use+"git+checkout+--+<file>..."+to+discard+changes+in+working+directory)
#
#++++modified:+++vendor/some_repo/some_file|660010|这样，您就可以像往常一样在project_root中运行git+add+--all，然后运行git+commit+"Changes+..."。|660011|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/5980960/git-repository-in-a-git-repository/25636069#25636069|1|https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md^0|4|N|0|0|2P|3|P|1F|1|0|P|G|2C|H|3F|9|0|0|3|U|1T|I|1A|9|0|4|D|K|I|0|2L|1|0|0|0|1W|1X|1|S|7|0|0|0|11|3|G|M|9|0|0|0|1Z|D|C|S|D|1A|O|0^^$0|@$1|2|3|4|5|6|7|1H|8|@]|9|@$A|1I|B|1J|1|1K]]|C|$]]|$1|D|3|E|5|6|7|1L|8|@$A|1M|B|1N|F|G]]|9|@$A|1O|B|1P|1|1Q]]|C|$]]|$1|H|3|I|5|6|7|1R|8|@$A|1S|B|1T|F|G]|$A|1U|B|1V|F|J]|$A|1W|B|1X|F|J]]|9|@]|C|$]]|$1|K|3|L|5|M|7|1Y|8|@]|9|@]|C|$N|O]]|$1|P|3|Q|5|6|7|1Z|8|@$A|20|B|21|F|G]|$A|22|B|23|F|G]|$A|24|B|25|F|J]]|9|@]|C|$]]|$1|R|3|S|5|6|7|26|8|@$A|27|B|28|F|J]|$A|29|B|2A|F|J]]|9|@]|C|$]]|$1|T|3|U|5|6|7|2B|8|@$A|2C|B|2D|F|G]]|9|@]|C|$]]|$1|V|3|W|5|M|7|2E|8|@]|9|@]|C|$N|O]]|$1|X|3|Y|5|6|7|2F|8|@$A|2G|B|2H|F|G]|$A|2I|B|2J|F|G]|$A|2K|B|2L|F|J]]|9|@]|C|$]]|$1|Z|3|10|5|M|7|2M|8|@]|9|@]|C|$N|O]]|$1|11|3|12|5|6|7|2N|8|@$A|2O|B|2P|F|G]|$A|2Q|B|2R|F|J]|$A|2S|B|2T|F|J]]|9|@]|C|$]]|$1|13|3|14|5|M|7|2U|8|@]|9|@]|C|$N|O]]|$1|15|3|16|5|6|7|2V|8|@$A|2W|B|2X|F|G]|$A|2Y|B|2Z|F|J]|$A|30|B|31|F|J]|$A|32|B|33|F|J]]|9|@]|C|$]]|$1|17|3|-4|5|6|7|34|8|@]|9|@]|C|$]]]|18|$19|$5|1A|1B|1C|C|$1D|1E]]|1F|$5|1A|1B|1C|C|$1D|1G]]]]

I also agree with <a href="https://stackoverflow.com/questions/5980960/git-repository-in-a-git-repository/25636069#25636069">Ronald William's answer</a>. The main purpose of Git submodules is updating the code taken from the outside world without need to commit changes if that code were modified by the update.

The Composer package management system does the same. Actually <a href="https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md" rel="nofollow noreferrer">they don't recommend to commit those changes either</a> and ignore the vendor folder in .gitignore in the root of project.

It is a nightmare if you'd try to commit this folder because some of the vendor/some_repo can be of a development version, and consequently they have a .git folder which results in all those packages become submodules even if you don't add them with <code>git submodule add</code>. You could see something like this if you modify <code>some_file</code> in a nested .git repository:

<pre><code>~/project_root $ git status
# On branch master
# Changes not staged for commit:
# (use "git add &lt;file&gt;..." to update what will be committed)
# (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
# (commit or discard the untracked or modified content in submodules)
#
# modified: vendor/nested_repo (modified content)
</code></pre>

Note the modified content in submodules entry and that you don't see the <code>some_file</code> name in the output. Instead you see the (modified content) notice, because the root_project .git sees the vendor/nested_repo as a submodule and does not track individual files in that folder.

If you run <code>git add --all</code> you'll get no result until you commit changes in <code>vendor/nested_repo</code> and only after that can you commit changes in the root repository.

Don't do this. Instead if you want to keep your project as a whole .git repository (any, not only Composer built repository), which is very convenient sometimes, add this entry to the root .gitignore BEFORE the initial commit:

<pre><code>.git
!/.git
</code></pre>

Unfortunately, for the whole recipe to work you need to run the <code>git add</code> command for each of the nested repositories you want later to modify individually. Notice that trailing slash in paths of repositories is a MUST.

<pre><code>~/project_root $ git add vendor/some_repo/ vendor/another_repo/
</code></pre>

Then modify <code>some_file</code> in the <code>vendor/some_repo</code> and see the difference:

<pre><code>~/project_root $ git status
# On branch master
# Changes not staged for commit:
# (use "git add &lt;file&gt;..." to update what will be committed)
# (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
#
# modified: vendor/some_repo/some_file
</code></pre>

That way you can run <code>git add --all</code> and then <code>git commit "Changes ..."</code> in the <code>project_root</code> as usual.

blocks|key|2562825|text|还有一些包管理解决方案。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2562826|诚然，Git子模块将允许您使用您所描述的架构进行开发，而Git子树提供了许多人喜欢的类似解决方案。|2562827|在我看来，包管理软件是任何复杂项目中不可或缺的一部分。我喜欢Composer，因为它支持直观的工作流。|offset|length|2562828|不幸的是，PhpStorm不支持Git子模块：|2562829|2562830|entityMap|0|LINK|mutability|MUTABLE|url|https://getcomposer.org/^0|0|0|U|8|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|U|8|@]|9|@$F|V|G|W|1|X]]|A|$]]|$1|H|3|I|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|10|8|@]|9|@]|A|$]]]|L|$M|$5|N|O|P|A|$Q|R]]]]

There are also package management solutions.

It is true that Git submodules would allow you to develop with the architecture you described, and Git subtrees provide a similar solution that many people prefer.

In my opinion, package management software is an integral part of any complex project. I like <a href="https://getcomposer.org/" rel="nofollow noreferrer">Composer</a> because of the intuitive workflows it supports.

Unfortunately Git submodules are not supported by PhpStorm:

<a href="http://youtrack.jetbrains.com/issue/IDEA-64024" rel="nofollow noreferrer">Git submodules should be supported (IDEA-64024)</a>

I have a Git repository including a Git repository.

<pre><code>repo1/
 .git/
 files
 repo2/
 .git/
 files
 files
</code></pre>

Is it possible to work with this architecture?

Git repository in a Git repository

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我有一个Git存储库，包括一个Git存储库。repo1/     .git/     files     repo2/          .git/          files     files是否可以使用此体系结构？

问Git存储库中的Git存储库
EN

回答 5

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git存储库中的Git存储库EN

回答 5

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git存储库中的Git存储库
EN