소스 검색

pre-commit: do not ignore submodule when running diff-index

Without this line, if the git config specifies to ignore submodule
change (what happned in the associated bug), this script is useless
because the command will never return gitlink change

R=sokcevic

Bug: 1496925
Change-Id: I6536b95502e708e44d6fd3e4909fd30eac8c7c98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4995364
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Yiwei Zhang 1 년 전
부모
커밋
03a1a8936e
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      hooks/pre-commit.py

+ 2 - 1
hooks/pre-commit.py

@@ -27,7 +27,8 @@ def main():
 
     has_deps_diff = False
     staged_gitlinks = []
-    diff = git_common.run('diff-index', '--cached', 'HEAD')
+    diff = git_common.run('diff-index', '--cached', '--ignore-submodules=dirty',
+                          'HEAD')
     for line in diff.splitlines():
         path = line.split()[-1]
         if path == 'DEPS':