summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authormartijn <martijn@martijnc.be>2017-07-09 14:44:30 -0700
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-03-07 17:12:41 +0000
commitcecd51513ab51dbb21a6cb830d3d5827dfaa1e4d (patch)
treea94ad255858371c3780a7b132a58fdbc64d7dd8f /.gitattributes
parent7f1d4f58ab4bf07e56ccf46684c52a868da40199 (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>
Diffstat (limited to '.gitattributes')
-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