Skip to content

Commit

Permalink
Use finegrained .out ignoring in the output directory .gitignores
Browse files Browse the repository at this point in the history
We already had a mostly up to date list in the directory specific
.gitignore files but the toplevel .gitignore contained a *.out
which took precedence (lower level files override higher level
files so removing *.out will allow for the src/test/regress/* files
to override the now removed .out file blocking). The reason for
not ignoring *.out is that we have quite a few tracked .out files
in the repository which we don't want to ignore changes to.

Also update the files to match the current set of tests since there
were a few missing.
  • Loading branch information
danielgustafsson committed Mar 31, 2016
1 parent e81df1d commit c550b9c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,5 @@ build.sh

# Added
*.swp
*.out

VERSION
6 changes: 6 additions & 0 deletions src/test/regress/expected/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ table_functions.out
tidycat2.out
tpch500GB.out
partindex_test.out
external_table.out
table_functions_optimizer.out
largeobject.out
qp_gist_indexes2.out
qp_gist_indexes2_optimizer.out
qp_regexp.out
4 changes: 3 additions & 1 deletion src/test/regress/sql/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ aocs.sql
appendonly.sql
bkup_bkupdb.sql
mapred.sql
ereport.sql
tidycat.sql
filespace.sql
upgrade.sql
Expand All @@ -29,3 +28,6 @@ tidycat2.sql
tpch500GB.sql
partindex_test.sql
external_table.sql
largeobject.sql
qp_gist_indexes2.sql
qp_regexp.sql

0 comments on commit c550b9c

Please sign in to comment.