更新版本的git

Git现在支持移动子模块:

从git 1.8.5开始，git mv old/submod new/submod就像预期的那样工作，并为你做了所有的管道工作。您可能希望使用git 1.9.3或更新版本，因为它包含了针对子模块移动的修复。

git的旧版本

正如评论中提到的，这个答案指的是旧版本git所需的步骤。

这个过程类似于如何删除子模块(参见如何删除子模块?):

Edit .gitmodules and change the path of the submodule appropriately, and put it in the index with git add .gitmodules. If needed, create the parent directory of the new location of the submodule (mkdir -p new/parent). Move all content from the old to the new directory (mv -vi old/parent/submodule new/parent/submodule). Make sure Git tracks this directory (git add new/parent). Remove the old directory with git rm --cached old/parent/submodule. Move the directory .git/modules/old/parent/submodule with all its content to .git/modules/new/parent/submodule. Edit the .git/modules/new/parent/config file, make sure that worktree item points to the new locations, so in this example it should be worktree = ../../../../../new/parent/module. Typically there should be two more .. than directories in the direct path in that place. Edit the file new/parent/module/.git, make sure that the path in it points to the correct new location inside the main project .git folder, so in this example gitdir: ../../../.git/modules/new/parent/submodule. git status output looks like this for me afterwards: # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: .gitmodules # renamed: old/parent/submodule -> new/parent/submodule # Finally, commit the changes.

给出的解决方案对我不起作用，然而一个类似的版本却起作用了。

这是一个克隆的存储库，因此子模块git repos包含在顶级存储库.git目录中。所有阳离子都来自顶部存储库:

编辑.gitmodules并更改相关子模块的"path ="设置。(不需要更改标签，也不需要将该文件添加到索引。) 编辑.git/modules/name/config，修改子模块的"worktree ="设置 运行: Mv submodule newpath/submodule Git add -u Git增加了新路径/子模块

我想知道如果存储库是原子的，还是相对的子模块，在我的情况下，它是相对的(submodule/。Git是一个指向topproject/.git/modules/submodule的引用)

更新版本的git

Git现在支持移动子模块:

从git 1.8.5开始，git mv old/submod new/submod就像预期的那样工作，并为你做了所有的管道工作。您可能希望使用git 1.9.3或更新版本，因为它包含了针对子模块移动的修复。

git的旧版本

正如评论中提到的，这个答案指的是旧版本git所需的步骤。

这个过程类似于如何删除子模块(参见如何删除子模块?):

Edit .gitmodules and change the path of the submodule appropriately, and put it in the index with git add .gitmodules. If needed, create the parent directory of the new location of the submodule (mkdir -p new/parent). Move all content from the old to the new directory (mv -vi old/parent/submodule new/parent/submodule). Make sure Git tracks this directory (git add new/parent). Remove the old directory with git rm --cached old/parent/submodule. Move the directory .git/modules/old/parent/submodule with all its content to .git/modules/new/parent/submodule. Edit the .git/modules/new/parent/config file, make sure that worktree item points to the new locations, so in this example it should be worktree = ../../../../../new/parent/module. Typically there should be two more .. than directories in the direct path in that place. Edit the file new/parent/module/.git, make sure that the path in it points to the correct new location inside the main project .git folder, so in this example gitdir: ../../../.git/modules/new/parent/submodule. git status output looks like this for me afterwards: # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: .gitmodules # renamed: old/parent/submodule -> new/parent/submodule # Finally, commit the changes.

对于我来说，运行git mv <old/path> <new/path失败:

Rename from 'old/path' to 'new/path' failed. Should I try again? (y/n)

在运行git deinit <old/path>后，我能够使用git mv。

在我的例子中，我想将一个子模块从一个目录移动到另一个子目录，例如:"AFNetworking" -> "ext/AFNetworking"以下是我遵循的步骤:

Edit .gitmodules changing submodule name and path to be "ext/AFNetworking" Move submodule's git directory from ".git/modules/AFNetworking" to ".git/modules/ext/AFNetworking" Move library from "AFNetworking" to "ext/AFNetworking" Edit ".git/modules/ext/AFNetworking/config" and fix the [core] worktree line. Mine changed from ../../../AFNetworking to ../../../../ext/AFNetworking Edit "ext/AFNetworking/.git" and fix gitdir. Mine changed from ../.git/modules/AFNetworking to ../../git/modules/ext/AFNetworking git add .gitmodules git rm --cached AFNetworking git submodule add -f <url> ext/AFNetworking

最后，我在git状态中看到:

matt$ git status
# On branch ios-master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   .gitmodules
#   renamed:    AFNetworking -> ext/AFNetworking

瞧。上面的例子没有改变目录深度，这对任务的复杂性有很大影响，也没有改变子模块的名称(这可能真的没有必要，但我这样做是为了与在该路径添加新模块时发生的情况保持一致)。

“[submodule”后面引号中的字符串并不重要。如果你愿意，你可以把它改成“foobar”。它用于在“.git/config”中查找匹配的条目。

因此，如果你在运行"git submodule init"之前进行更改，它会正常工作。如果你做了更改(或通过合并进行更改)，你需要手动编辑.git/config或再次运行"git submodule init"。如果您选择后者，您将在.git/config中留下一个带有旧名称的无害的“搁浅”条目。