diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-13 10:43:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-14 11:46:05 +0000 |
| commit | b5357f68bce6b1f3554745c03295fcc6c47a7e5f (patch) | |
| tree | 6f4358a36b360c5b987c8952ecf9ed0b4c593a72 /git-hooks | |
| parent | 62648ad92d13d29b924fa9dc2419cfb5e812846c (diff) | |
| download | qtrepotools-b5357f68bce6b1f3554745c03295fcc6c47a7e5f.tar.gz | |
permit tabs in qt 3d studio files
Change-Id: Ic85f5fced6c6587f48c6f54512bf681543f887ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
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 d6cce72..42b91d0 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -776,7 +776,7 @@ while (<DIFF>) { $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|\.(pbxproj|plist(\.[^.\/]+)?|def|mk|spec|changes|[xn]ib|storyboardc?|go|svg)(?:\.in)?$)/); + && ($file !~ /((^|\/)Makefile\b|debian[.\/]rules|\.(pbxproj|plist(\.[^.\/]+)?|def|mk|spec|changes|[xn]ib|storyboardc?|go|svg|ui[ap])(?:\.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 |