From 55063f854d52f4adec0d62e883bdd9cf8c2277f7 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Tue, 3 Sep 2019 15:21:04 +0200 Subject: Fix Git ignore for tmp/, shared/, and plugins/ The old rules meant that any future changes to these directories would require the use of `git add -f` to be staged. This is problematic for the upcoming FOSS-only mirror of GitLab. Any changes to be synced to this mirror are staged using `git add --all .`, which due to the Git ignore rules would not add the tmp/ and shared/ directories. This then leads to various specs failing because they expect certain sub-directories of these directories to be available. This commit changes the rules so that we include the .gitkeep files, ignore other files, and completely ignore anything in tmp/test. This requires that the rules are specified in tmp/.gitignore and shared/.gitignore, instead of the top-level .gitignore, without this I could not get Git to include the .gitkeep files properly. --- tmp/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tmp/.gitignore (limited to 'tmp') diff --git a/tmp/.gitignore b/tmp/.gitignore new file mode 100644 index 00000000000..a383b23fb78 --- /dev/null +++ b/tmp/.gitignore @@ -0,0 +1,5 @@ +* +!*/ +!.gitignore +!.gitkeep +/tests/ -- cgit v1.2.1