1

我在我的 vim 存储库中添加了两个子模块，并且 git status 命令总是输出以下内容：

On branch master
Changed but not updated:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

   modified:   bundle/snipmate
   modified:   bundle/yankring

我跑过：

git submodule init
git submodule update
git add .

并没有发生任何事情让它消失。有任何想法吗？

4

1 回答 1

3

这可能是由于在git-1.7.0中添加的更改，如果子模块包含修改或未跟踪的文件，则子模块将被标记为脏。

git status可以选择--ignore-submodules忽略特定更改。来自man git-status：

--ignore-submodules[=<when>]
              Ignore changes to submodules when looking for changes. <when>
              can be either "none", "untracked", "dirty" or "all", which is
              the default. Using "none" will consider the submodule modified
              when it either contains untracked or modified files or its HEAD
              differs from the commit recorded in the superproject and can be
              used to override any settings of the ignore option in git-
              config(1) or gitmodules(5). When "untracked" is used submodules
              are not considered dirty when they only contain untracked
              content (but they are still scanned for modified content).
              Using "dirty" ignores all changes to the work tree of
              submodules, only changes to the commits stored in the
              superproject are shown (this was the behavior before 1.7.0).
              Using "all" hides all changes to submodules (and suppresses the
              output of submodule summaries when the config option
              status.submodulesummary is set).

（此选项仅在git-1.7.2中添加）

于 2010-10-05T05:18:19.743 回答