diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-18 11:18:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-19 11:37:14 +0000 |
| commit | 21f4d04349062ec4cf0ea97f888618c4d9681728 (patch) | |
| tree | 72b8416088ac574fcf65dce73b3bc26ba3e0dde5 /git-hooks | |
| parent | ef0773a19a9697e2c3a6a2046bd1be670f7e58e4 (diff) | |
ignore missing trailing eol in .json files within xcassets
Change-Id: I3a38d2dedc96bbe4aa814ceb008f1b08982fe586
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 0f47316..aa0e6e4 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -681,7 +681,7 @@ while (<DIFF>) { $tabs_check = $ws_check && !$tsv_check && !defined($cfg{tabs}) && ($file !~ /((^|\/)Makefile\b|debian[.\/]rules|\.(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(\.[^.\/]+)?$/); # Xcode consistently forgets the trailing newline + $eof_check = !$is_bin && ($file !~ /(\.plist(\.[^.\/]+)?|\.xcassets\/.*\.json)$/); # Xcode consistently forgets the trailing newline # .ts files usually contain languages other than English $spell_check = !defined($cfg{spell}) && !$foreign && ($file !~ /\.ts$/i); $apple_check = !$foreign && ($file !~ /\.ts$/i); |