summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartijn <martijn@martijnc.be>2017-07-09 14:44:30 -0700
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-14 09:59:13 +0000
commitafbf89d18ced7ac233506b0cde1da0b9ad0ebe61 (patch)
tree524a6923ad9660bcbab2285045b3e94cf34527ed
parent3fa04d22883e42bd987e4f83d394a1040b410024 (diff)
downloadqtwebengine-chromium-afbf89d18ced7ac233506b0cde1da0b9ad0ebe61.tar.gz
[Backport] Add a .gitattributes file to force LF line-endings in .pins files.
This change forces the pins files to use LF line-endings and adds a check to detect CRLF line-endings that outputs a more helpful error message. BUG=729553 Change-Id: I9a470c1d07dcacabcae1ce9029f35323cd86b4d2 Review-Url: https://codereview.chromium.org/2941543002 Cr-Commit-Position: refs/heads/master@{#485165} Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..a6d97b28af3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Force LF checkout of the pins files to avoid transport_security_state_generator errors.
+/chromium/net/http/*.pins text eol=lf