summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartijn <martijn@martijnc.be>2017-07-09 14:44:30 -0700
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-23 13:31:33 +0200
commitc926e41f3a42720c0de20bab43b8b585c218273b (patch)
tree35df7e99450b4e04bb54bd1a00ad8f0981a3573e
parentd7ae2b25032053423727f77c6e78c24301fc2741 (diff)
[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: Allan Sandfeld Jensen <allan.jensen@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