Skip to content

Commit a059e15

Browse files
michaelpqmichaelpq
committed
Re-add locally-generated files in pg_upgrade's .gitignore and Makefile
This reverts the changes to pg_upgrade's Makefile and .gitignore done in 15b6d21. The TAP tests run in isolation, executing pg_upgrade in tmp_check/ in the build directory so as any files created in the execution path (reindex_hash.sql and delete_old_cluster.{sh,bat}) are never in the tree, so entries are not necessary in this case. However, not having these impacts the cleanliness of the code tree when running ./pg_upgrade directly from src/bin/pg_upgrade/. This commit adds back to .gitignore all the files generated in the execution path, and the Makefile rule to clean them up if they exist. Per gripe from Tom Lane. Discussion: https://postgr.es/m/90595.1655227384@sss.pgh.pa.us
1 parent 5a97b13 commit a059e15

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

‎src/bin/pg_upgrade/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
/pg_upgrade
2+
# Generated by manual invocation
3+
/delete_old_cluster.sh
4+
/delete_old_cluster.bat
5+
/reindex_hash.sql
26
# Generated by test suite
37
/log/
48
/tmp_check/

‎src/bin/pg_upgrade/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ uninstall:
4848

4949
clean distclean maintainer-clean:
5050
rm -f pg_upgrade$(X) $(OBJS)
51-
rm -rf log/ tmp_check/
51+
rm -rf delete_old_cluster.sh log/ tmp_check/ \
52+
reindex_hash.sql
5253

5354
check:
5455
$(prove_check)

0 commit comments

Comments
 (0)