diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-18 11:08:21 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-19 11:37:32 +0000 |
| commit | 9f5cfd98722f9b04a7ec1556dee9c77f0977e59c (patch) | |
| tree | 757b4c377b1b6e19a964041520cdbd0bdec42dd2 /git-hooks | |
| parent | 21f4d04349062ec4cf0ea97f888618c4d9681728 (diff) | |
exclude pbxproj from tabs check
Change-Id: Ib57adfb3082e6937a3e4983e93629a299b0b6fe8
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'git-hooks')
| -rwxr-xr-x | git-hooks/sanitize-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index aa0e6e4..e88a605 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -678,7 +678,7 @@ while (<DIFF>) { $mixws_check = !$merge && !$foreign && $clike && !defined($cfg{mixws}); $ws_check = !defined($cfg{style}) && !$foreign && ($file !~ /\.(ts|diff|patch)$|^\.gitmodules$/); $tsv_check = $ws_check && ($file =~ /((^|\/)objects\.map$|\.tsv$)/); - $tabs_check = $ws_check && !$tsv_check && !defined($cfg{tabs}) && ($file !~ /((^|\/)Makefile\b|debian[.\/]rules|\.(plist(\.[^.\/]+)?|def|spec|changes|[xn]ib|storyboardc?|go)(?:\.in)?$)/); + $tabs_check = $ws_check && !$tsv_check && !defined($cfg{tabs}) && ($file !~ /((^|\/)Makefile\b|debian[.\/]rules|\.(pbxproj|plist(\.[^.\/]+)?|def|spec|changes|[xn]ib|storyboardc?|go)(?:\.in)?$)/); $allow_2spaces = $ws_check && ($file =~ /\.md$/); $ctlkw_check = $tabs_check && $clike; $eof_check = !$is_bin && ($file !~ /(\.plist(\.[^.\/]+)?|\.xcassets\/.*\.json)$/); # Xcode consistently forgets the trailing newline |