From b9978e922054eabcadb442e2dd68e07afa1124f6 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 08:49:58 +0200 Subject: [PATCH 1/7] explain what we want and what not in .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index b53b06b03cac6..64b5e577607ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# This file should only ignore things that are generatd during a build, +# generated by common IDEs, and optional files controlled by the user +# that affect the build (such as config.toml). +# FIXME: This needs cleanup. *~ .#* .DS_Store From b2af7187d96d3f28fe91380df14da40c5d55611f Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 09:04:37 +0200 Subject: [PATCH 2/7] we don't clutter the src/ dir any more --- src/.gitignore | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 src/.gitignore diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index f1b36f5858037..0000000000000 --- a/src/.gitignore +++ /dev/null @@ -1,46 +0,0 @@ -*.a -*.aux -*.bc -*.boot -*.bz2 -*.cmi -*.cmo -*.cmx -*.cp -*.cps -*.d -*.dSYM -*.def -*.diff -*.dll -*.dylib -*.elc -*.epub -*.exe -*.fn -*.html -*.kdev4 -*.ky -*.ll -*.llvm -*.log -*.o -*.orig -*.out -*.patch -*.pdb -*.pdf -*.pg -*.pot -*.pyc -*.rej -*.rlib -*.rustc -*.so -*.swo -*.swp -*.tmp -*.toc -*.tp -*.vr -*.x86 From 58c231dce77d1c6b22cdd60581b802dcd3599f45 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 09:11:32 +0200 Subject: [PATCH 3/7] gitignore: remove some things that look ancient --- .gitignore | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.gitignore b/.gitignore index 64b5e577607ee..860dc37129185 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,6 @@ __pycache__/ .valgrindrc .vscode .favorites.json -/*-*-*-*/ -/*-*-*/ /Makefile /build /config.toml @@ -29,9 +27,6 @@ __pycache__/ /inst/ /llvm/ /mingw-build/ -/nd/ -/obj/ -/rt/ /rustllvm/ /src/libcore/unicode/DerivedCoreProperties.txt /src/libcore/unicode/DerivedNormalizationProps.txt @@ -41,11 +36,6 @@ __pycache__/ /src/libcore/unicode/SpecialCasing.txt /src/libcore/unicode/UnicodeData.txt /src/libcore/unicode/downloaded -/stage[0-9]+/ -/target -target/ -/test/ -/tmp/ tags tags.* TAGS @@ -54,14 +44,8 @@ TAGS.* \#*\# config.mk config.stamp -keywords.md -lexer.ml Session.vim src/etc/dl -tmp.*.rs -version.md -version.ml -version.texi .cargo !src/vendor/** /src/target/ From 9cea446c6ccfbed372eb78866f7b5751361c60c8 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 11:19:09 +0200 Subject: [PATCH 4/7] Cargo.toml is at the root these days --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 860dc37129185..5e536ccf615a1 100644 --- a/.gitignore +++ b/.gitignore @@ -47,8 +47,4 @@ config.stamp Session.vim src/etc/dl .cargo -!src/vendor/** -/src/target/ - no_llvm_build - From fcb186d0fef2431e8ddccff879d10b7101395827 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 11:19:44 +0200 Subject: [PATCH 5/7] fix typo in .gitignore Co-Authored-By: Vadim Petrochenkov --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5e536ccf615a1..9515fa8c2f84d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# This file should only ignore things that are generatd during a build, +# This file should only ignore things that are generated during a build, # generated by common IDEs, and optional files controlled by the user # that affect the build (such as config.toml). # FIXME: This needs cleanup. From 4bde056ed22a8c2904855258519fc5581ebe340b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 19:42:46 +0200 Subject: [PATCH 6/7] tweak ignores --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9515fa8c2f84d..d4077351e084d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,14 +19,16 @@ __pycache__/ .vscode .favorites.json /Makefile -/build +/build/ +/target/ /config.toml /dist/ /dl/ -/doc +/doc/ /inst/ /llvm/ /mingw-build/ +/obj/ /rustllvm/ /src/libcore/unicode/DerivedCoreProperties.txt /src/libcore/unicode/DerivedNormalizationProps.txt @@ -45,6 +47,5 @@ TAGS.* config.mk config.stamp Session.vim -src/etc/dl .cargo no_llvm_build From 798767ca2119a9557c6180d271ae039987d342dc Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 8 Aug 2019 19:43:44 +0200 Subject: [PATCH 7/7] more alphabetical --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d4077351e084d..a0b491f42789a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ __pycache__/ .favorites.json /Makefile /build/ -/target/ /config.toml /dist/ /dl/ @@ -38,6 +37,7 @@ __pycache__/ /src/libcore/unicode/SpecialCasing.txt /src/libcore/unicode/UnicodeData.txt /src/libcore/unicode/downloaded +/target/ tags tags.* TAGS