From 620da34f0af0026ce47193a5fc85a52fe10390e8 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 26 Nov 2014 15:17:55 +0100
Subject: [PATCH] ignore submodule updates in diff
this avoids that we blow up on submodule updates inside merges.
Change-Id: I5608554ae4991b379219199c32e2394c3a0b1518
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
git-hooks/sanitize-commit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index 6df5272..9b110e6 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -472,7 +472,7 @@ my $tsv_check;
my $eof_check;
my $ctlkw_check;
my $apple_check;
-open DIFF, "git diff-tree --patience --no-commit-id --diff-filter=ACMR --src-prefix=\@old\@/ --dst-prefix=\@new\@/ --full-index -r -U100000 --cc -C -l1000 --root ".$sha1." |" or die "cannot run git: $!";
+open DIFF, "git diff-tree --patience --no-commit-id --diff-filter=ACMR --ignore-submodules --src-prefix=\@old\@/ --dst-prefix=\@new\@/ --full-index -r -U100000 --cc -C -l1000 --root ".$sha1." |" or die "cannot run git: $!";
while (<DIFF>) {
if (/^-/) {
if ($mixws_check) {
--
GitLab