From cba3dabf247ead4344acfd756bac235b6104430f Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Fri, 6 Dec 2019 13:31:55 -0500 Subject: [PATCH] =?UTF-8?q?Add=20.gitattributes,=20setting=20=E2=80=9Ctext?= =?UTF-8?q?=20eol=3Dlf=E2=80=9D=C2=A0or=20=E2=80=9Cbinary=E2=80=9D=C2=A0fo?= =?UTF-8?q?r=20all=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should prevent accidental "\r\n" line endings from being introduced again, as happened in 359fc4a1336d, fixed by 31470459b624. Also includes: Update mini_chromium to 0512d42698bfb47f2016ac627177c22d22b983d4 0512d42698bf Add .gitattributes, setting “text eol=lf” for all files Change-Id: Id84c014914fec66632006ed364e2b14b4f1c175c Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1953807 Commit-Queue: Mark Mentovai Reviewed-by: Robert Sesek --- .gitattributes | 59 +++++++++++++++++++ .gitignore | 14 +++++ DEPS | 2 +- handler/win/.gitattributes | 21 +++++++ .../.gitattributes | 17 ++++++ 5 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 .gitattributes create mode 100644 handler/win/.gitattributes create mode 100644 snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..9bfc20d1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,59 @@ +# Copyright 2019 The Crashpad Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*.S text eol=lf +*.asm text eol=lf +*.c text eol=lf +*.cc text eol=lf +*.cmx text eol=lf +*.css text eol=lf +*.defs text eol=lf +*.doxy text eol=lf +*.gn text eol=lf +*.gni text eol=lf +*.go text eol=lf +*.gyp text eol=lf +*.gypi text eol=lf +*.h text eol=lf +*.m text eol=lf +*.md text eol=lf +*.mm text eol=lf +*.pem text eol=lf +*.plist text eol=lf +*.proctype text eol=lf +*.py text eol=lf +*.sh text eol=lf +*.sym text eol=lf +*.txt text eol=lf +*.yaml text eol=lf +.clang-format text eol=lf +.gitattributes text eol=lf +.gitignore text eol=lf +.vpython text eol=lf +/AUTHORS text eol=lf +/CONTRIBUTORS text eol=lf +/LICENSE text eol=lf +/codereview.settings text eol=lf +APPLE_LICENSE text eol=lf +COPYING.LIB text eol=lf +DEPS text eol=lf +README text eol=lf +README.crashpad text eol=lf + +*.dat binary +*.dll binary +*.ico binary +*.obj binary +*.png binary +*.so binary diff --git a/.gitignore b/.gitignore index 90038f1d..eee931eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,17 @@ +# Copyright 2014 The Crashpad Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + *.Makefile *.ninja *.pyc diff --git a/DEPS b/DEPS index 7b5d60b2..a20b19c0 100644 --- a/DEPS +++ b/DEPS @@ -33,7 +33,7 @@ deps = { '7bde79cc274d06451bf65ae82c012a5d3e476b5a', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - 'cdab1e6263ec7f3f61763efc1dac863f8dc07c80', + '0512d42698bfb47f2016ac627177c22d22b983d4', 'crashpad/third_party/libfuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + 'fda403cf93ecb8792cb1d061564d89a6553ca020', diff --git a/handler/win/.gitattributes b/handler/win/.gitattributes new file mode 100644 index 00000000..6495e512 --- /dev/null +++ b/handler/win/.gitattributes @@ -0,0 +1,21 @@ +# Copyright 2019 The Crashpad Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This should be a .cc file, which would allow its attributes to be controlled +# by the *.cc pattern in the root .gitattributes file, but it’s named with a +# .cpp extension instead. This file needs to be built with VC++6, a vintage 1998 +# compiler, which might not understand .cc to mean C++. Rather than setting +# attributes globally for .cpp files, which are undesirable (.cc should be used +# in its place), provide a file-specific mapping here. +/z7_test.cpp text eol=lf diff --git a/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes b/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes new file mode 100644 index 00000000..69463d13 --- /dev/null +++ b/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes @@ -0,0 +1,17 @@ +# Copyright 2019 The Crashpad Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ELF executables normally don’t have any extension, so there’s no pattern to +# match in the root .gitattributes file. +/ret42 binary