From 7c35dd63ac09f47c672c8ab4b4d56429a65eb64e Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sat, 6 Jun 2020 15:44:00 +0100 Subject: [PATCH 1/6] Add .gitignore file --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..916976a08cb --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vscode +.editorconfig +.bzr From 786de75c919950d0c59e6bfbd5e39666d20fe423 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 8 Jun 2020 14:31:14 +0100 Subject: [PATCH 2/6] Add autogenerated files --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 916976a08cb..17dd3b0e6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ .vscode -.editorconfig .bzr +btlayer-* +Makefile.in +**/Makefile.in +configure +SPONSORS +aclocal.m4 +autom4te.cache +cfgaux +include/autoconf.h.in +libltdl From df10f948b841e2a0cf25fd4d0210049e5d063ea6 Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Mon, 8 Jun 2020 11:47:01 -0400 Subject: [PATCH 3/6] Remove files that violate .gitignore policy I am using the following policy: 1. Any untracked file that can be generated in a working directory by any valid Squid build command(s) SHOULD be listed in .gitignore. Build commands include ./bootstrap.sh, ./configure, make, test-builds.sh, and source-maintenance.sh (each with any supported parameters). 2. Untracked directory- or project-specific configuration files for development tools commonly used for Squid development MAY be listed in .gitignore, provided their inclusion is sponsored by a frequent contributor familiar with the tool. 3. Other files SHOULD NOT be listed in .gitignore. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 17dd3b0e6e7..497e853ca16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .vscode -.bzr btlayer-* Makefile.in **/Makefile.in From e94fb437039f22dbc4307431b56f9db33826ae85 Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Mon, 8 Jun 2020 11:55:11 -0400 Subject: [PATCH 4/6] fixup: Removed a redundant entry AFAICT, "foo" and "**/foo" mean the same thing. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 497e853ca16..5e1a6ef12ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .vscode btlayer-* Makefile.in -**/Makefile.in configure SPONSORS aclocal.m4 From 2c5f15b58ecd029d9273905a05e7e512e47df36e Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Mon, 8 Jun 2020 11:58:22 -0400 Subject: [PATCH 5/6] Ensure stable, well-defined order to simplify human editing and review The sort command in the comment can be copy-pasted to reorder the already modified file. --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5e1a6ef12ba..0742fba9c57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ +# Sorted with: LC_ALL=C sort --stable --unique --output=.gitignore .gitignore .vscode -btlayer-* Makefile.in -configure SPONSORS aclocal.m4 autom4te.cache +btlayer-* cfgaux +configure include/autoconf.h.in libltdl From c16f35e9bf2a2a43726bd37713416e7e923f0a1e Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Mon, 8 Jun 2020 14:14:24 -0400 Subject: [PATCH 6/6] Added build-generated files, dir slashes; dropped the sorting command The added files were collected (over the course of a few years) by bootstrapping, configuring, building, and checking Squid sources. Some entries are likely to be stale, but I am not aware of any specific ones. FWIW, all but five specific entries do exist in my working directory. No specific entries are currently tracked by git AFAICT. Also mark entries containing directory names with a trailing slash to highlight their elevated impact or special role. The simple sorting one-liner does not work with negative rules so I replaced it with at TODO. We can and perhaps should add a simple script that orders .gitignore accordingly. Alternatively, we can remove the negative rules for two Makefiles and list all untracked Makefiles individually instead. Only two Makefiles are currently tracked. --- .gitignore | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 160 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0742fba9c57..4409808bffe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,166 @@ -# Sorted with: LC_ALL=C sort --stable --unique --output=.gitignore .gitignore +# TODO: Sort me (while preserving the meaning of the negative rules). +*.a +*.astylebak +*.astylebak.* +*.la +*.lang +*.lo +*.log +*.o +*.trs +*~ +.deps/ +.dirstamp .vscode -Makefile.in -SPONSORS aclocal.m4 -autom4te.cache +autom4te.cache/ btlayer-* -cfgaux +cfgaux/ +compat/testPreCompiler +config.status configure +doc/Programming-Guide/html/ +errors/translate-warn +include/autoconf.h include/autoconf.h.in +include/stamp-h1 +lib/tests/testRFC1738 libltdl +libtool +Makefile +!contrib/nextstep/Makefile +!doc/Programming-Guide/Makefile +Makefile.in +SPONSORS +src/acl/external/delayer/ext_delayer_acl +src/acl/external/delayer/ext_delayer_acl.8 +src/acl/external/file_userip/ext_file_userip_acl +src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl +src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl +src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 +src/acl/external/SQL_session/ext_sql_session_acl +src/acl/external/SQL_session/ext_sql_session_acl.8 +src/acl/external/unix_group/ext_unix_group_acl +src/acl/external/wbinfo_group/ext_wbinfo_group_acl +src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 +src/anyp/ProtocolType.cc +src/auth/basic/DB/basic_db_auth +src/auth/basic/DB/basic_db_auth.8 +src/auth/basic/fake/basic_fake_auth +src/auth/basic/getpwnam/basic_getpwnam_auth +src/auth/basic/NCSA/basic_ncsa_auth +src/auth/basic/NIS/basic_nis_auth +src/auth/basic/POP3/basic_pop3_auth +src/auth/basic/POP3/basic_pop3_auth.8 +src/auth/basic/RADIUS/basic_radius_auth +src/auth/basic/SMB/basic_smb_auth +src/auth/CredentialState.cc +src/auth/digest/file/digest_file_auth +src/auth/negotiate/kerberos/negotiate_kerberos_auth +src/auth/negotiate/kerberos/negotiate_kerberos_auth_test +src/auth/negotiate/wrapper/negotiate_wrapper_auth +src/auth/ntlm/fake/ntlm_fake_auth +src/auth/Type.cc +src/cf.data +src/cf_gen +src/cf_gen_defines.cci +src/cf_parser.cci +src/DiskIO/DiskDaemon/diskd +src/DiskIO/DiskDaemon/time.cc +src/err_detail_type.cc +src/err_type.cc +src/globals.cc +src/hier_code.cc +src/http/MethodType.cc +src/http/url_rewriters/fake/url_fake_rewrite +src/http/url_rewriters/LFS/url_lfs_rewrite +src/http/url_rewriters/LFS/url_lfs_rewrite.8 +src/icp_opcode.cc +src/log/DB/log_db_daemon +src/log/DB/log_db_daemon.8 +src/log/file/log_file_daemon +src/lookup_t.cc +src/repl_modules.cc +src/security/cert_generators/file/security_file_certgen +src/security/cert_generators/file/security_file_certgen.8 +src/security/cert_validators/fake/security_fake_certverify +src/security/cert_validators/fake/security_fake_certverify.8 +src/squid +src/squid.8 +src/squid.conf.default +src/squid.conf.documented +src/store/id_rewriters/file/storeid_file_rewrite +src/store/id_rewriters/file/storeid_file_rewrite.8 +src/swap_log_op.cc +src/test_tools.cc +src/tests/test_http_range +src/tests/testACLMaxUserIP +src/tests/testBoilerplate +src/tests/testCacheManager +src/tests/testCharacterSet +src/tests/testConfigParser +src/tests/testDiskIO +src/tests/testDns +src/tests/testEnumIterator +src/tests/testEvent +src/tests/testEventLoop +src/tests/testHttp1Parser +src/tests/testHttpReply +src/tests/testHttpRequest +src/tests/testIcmp +src/tests/testIpAddress +src/tests/testLookupTable +src/tests/testMem +src/tests/testNetDb +src/tests/testRefCount +src/tests/testRock +src/tests/testSBuf +src/tests/testSBufList +src/tests/testStatHist +src/tests/testStore +src/tests/testString +src/tests/testTokenizer +src/tests/testUfs +src/tests/testURL +src/tests/testYesNoNone +src/unlinkd +test-suite/debug +test-suite/ESIExpressions +test-suite/mem_hdr_test +test-suite/mem_node_test +test-suite/MemPoolTest +test-suite/splay +test-suite/squid-conf-tests +test-suite/STUB.h +test-suite/stub_cbdata.cc +test-suite/stub_debug.cc +test-suite/stub_fatal.cc +test-suite/stub_libmem.cc +test-suite/stub_MemBuf.cc +test-suite/stub_SBuf.cc +test-suite/stub_tools.cc +test-suite/syntheticoperators +test-suite/VirtualDeleteOperator +testHeaders +tools/cachemgr.cgi +tools/cachemgr.cgi.8 +tools/CharacterSet.cc +tools/CharacterSet.cc +tools/helper-mux/helper-mux +tools/helper-mux/helper-mux.8 +tools/Here.cc +tools/MemBuf.cc +tools/purge/purge +tools/squidclient/squidclient +tools/squidclient/STUB.h +tools/squidclient/stub_debug.cc +tools/squidclient/stub_libmem.cc +tools/squidclient/test_tools.cc +tools/squidclient/time.cc +tools/STUB.h +tools/stub_cbdata.cc +tools/stub_debug.cc +tools/stub_libmem.cc +tools/stub_mem.cc +tools/test_tools.cc +tools/time.cc