summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorEli Ribble <eliribble@google.com>2019-05-02 18:21:42 -0700
committerEli Ribble <eliribble@google.com>2019-05-02 18:21:42 -0700
commit2d095da4f19ec20f56fa8e02bb2012b156d8ee1a (patch)
tree5d4a1d7734ac58561a1b5e2a999b3de208f3c320 /project.py
parent266f74c88844aa58189af4343aac2467c4b105f0 (diff)
downloadgit-repo-2d095da4f19ec20f56fa8e02bb2012b156d8ee1a.tar.gz
Ignore submodules when calculating 'git diff-files'
This allows projects to include submodules inside of projects that use repo without repo incorrectly believing the area is dirty just because a submodule has updates. This is in line with git porcelain commands which generally require a commandline flag to include submodules (git add, git rebase). Change-Id: Ide8a292162a42ab35145b5c4ca8ca0d020cdfe81
Diffstat (limited to 'project.py')
-rwxr-xr-xproject.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/project.py b/project.py
index f9eb7a28..65bc3a04 100755
--- a/project.py
+++ b/project.py
@@ -2689,6 +2689,7 @@ class Project(object):
2689 def DiffZ(self, name, *args): 2689 def DiffZ(self, name, *args):
2690 cmd = [name] 2690 cmd = [name]
2691 cmd.append('-z') 2691 cmd.append('-z')
2692 cmd.append('--ignore-submodules')
2692 cmd.extend(args) 2693 cmd.extend(args)
2693 p = GitCommand(self._project, 2694 p = GitCommand(self._project,
2694 cmd, 2695 cmd,