除了子模块中的新提交之外，我如何`git add -u`？

Question

My current git status is:

modified:   Gemfile
modified:   Gemfile.lock
modified:   ... many more files
modified:   submodule_1 (new commits)
modified:   submodule_2 (new commits)
modified:   ... many more updated submodules ...

How do I git add -u except new commits in submodules?

What I want to achieve is an equivalent of git add -u , then git reset HEAD submodule_1 submodule_2 ... submodule_n , or an equivalent of git add -u Gemfile Gemfile.lock ...all other files that are not submodules...

Answer 1

Once git add -u is done, you would need to reset all submodule paths.
As documented in " List submodules in a git repository "

git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | xargs git reset -- 

This would list all submodule paths and do a git reset on each one.

A similar idea, from this gist :

for i in `git config -f .gitmodules --get-regexp path | cut -d" " -f2` ; do git reset -- $i ; done

Final solution, a bashrc/zshrc funnction that does git add -u and resets submodules:

gitaddus() {
  git add -u
  git config -f .gitmodules --get-regexp path | awk '{ print $2 }' | xargs git reset -- >/dev/null
  git status
}

(There's still a room for improvements, eg check which submodules are already added to the index so we don't git reset these.)