Commit 620da34f authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

ignore submodule updates in diff


this avoids that we blow up on submodule updates inside merges.

Change-Id: I5608554ae4991b379219199c32e2394c3a0b1518
Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
parent a2ae0a78
No related merge requests found
Showing with 1 addition and 1 deletion
...@@ -472,7 +472,7 @@ my $tsv_check; ...@@ -472,7 +472,7 @@ my $tsv_check;
my $eof_check; my $eof_check;
my $ctlkw_check; my $ctlkw_check;
my $apple_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>) { while (<DIFF>) {
if (/^-/) { if (/^-/) {
if ($mixws_check) { if ($mixws_check) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment