From ed1955c992127e9eaf4b91c61f71f8da3a0d8563 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Mon, 21 Mar 2011 22:39:34 +0800 Subject: [PATCH] Revert "Fixed issue #745: Unchanged submodules show up as changed in commit dialog" This reverts commit fe3c6cab7eb6df79bf99eefaca321e4d2908a750. Ignore changes to submodules in the diff generation. use config diff.ignoreSubmodules "none" "untracked" "dirty" "all". Conflicts: src/Changelog.txt src/Git/GitStatusListCtrl.cpp --- src/Git/GitStatusListCtrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index 72b021713..3cad85e70 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -4883,9 +4883,9 @@ int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list) if(!g_Git.IsInitRepos()) { if(list == NULL) - cmd=(_T("git.exe diff-index --ignore-submodules=dirty --raw ") + head + _T(" --numstat -C -M -z")); + cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z")); else - cmd.Format(_T("git.exe diff-index --ignore-submodules=dirty --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString()); + cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString()); if(g_Git.Run(cmd,&cmdout)) { -- 2.11.4.GIT