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.
This commit is contained in:
Yorick Peterse 2019-09-03 15:21:04 +02:00
parent da0a5c7cc2
commit 55063f854d
No known key found for this signature in database
GPG key ID: EDD30D2BEB691AC9
4 changed files with 14 additions and 3 deletions

3
.gitignore vendored
View file

@ -61,11 +61,9 @@ eslint-report.html
/shared/artifacts/ /shared/artifacts/
/rails_best_practices_output.html /rails_best_practices_output.html
/tags /tags
/tmp/*
/vendor/bundle/* /vendor/bundle/*
/vendor/gitaly-ruby /vendor/gitaly-ruby
/builds* /builds*
/shared/*
/.gitlab_workhorse_secret /.gitlab_workhorse_secret
/webpack-report/ /webpack-report/
/knapsack/ /knapsack/
@ -73,7 +71,6 @@ eslint-report.html
/locale/**/LC_MESSAGES /locale/**/LC_MESSAGES
/locale/**/*.time_stamp /locale/**/*.time_stamp
/.rspec /.rspec
/plugins/*
/.gitlab_pages_secret /.gitlab_pages_secret
/.gitlab_smime_key /.gitlab_smime_key
/.gitlab_smime_cert /.gitlab_smime_cert

5
plugins/.gitignore vendored Normal file
View file

@ -0,0 +1,5 @@
*
!*/
!.gitignore
!.gitkeep
!examples/*

4
shared/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
*
!*/
!.gitignore
!.gitkeep

5
tmp/.gitignore vendored Normal file
View file

@ -0,0 +1,5 @@
*
!*/
!.gitignore
!.gitkeep
/tests/