git: Merge .gitignore files into a single file
PATCH 1/1 git: Merge .gitignore files into a single file
We already track a lot of files over the whole directory structure in the main .gitignore file. But a few additional ones had been added into some of the subdirectories.
This unifies all these files into a master file for the whole project, making it easier to know where to look at and edit if changes needs to be done.
--- .gitignore | 5 +++++ sample/sample-keys/.gitignore | 1 - tests/unit_tests/.gitignore | 1 - vendor/.gitignore | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 sample/sample-keys/.gitignore delete mode 100644 tests/unit_tests/.gitignore delete mode 100644 vendor/.gitignore
.gitignore +5 -0
@@ -51,11 +51,16 @@ config-msvc-local.h config-msvc-version.h doc/openvpn.8.html distro/rpm/openvpn.spec +sample/sample-keys/sample-ca/ +vendor/.build +vendor/dist tests/t_client.sh tests/t_client-*-20??????-??????/ t_client.rc t_client_ips.rc +tests/unit_tests/*/*_testdriver +tests/unit_tests/*/*/*_testdriver src/openvpn/openvpn include/openvpn-plugin.h
sample/sample-keys/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -sample-ca/
tests/unit_tests/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -*_testdriver
vendor/.gitignore deleted +0 -2
@@ -1,2 +0,0 @@ -.build/ -dist/
Signature · 1 line
2.11.0
Hi,
Quoted 28 lines · David Sommerseth
We already track a lot of files over the whole directory structure in the main .gitignore file. But a few additional ones had been added into some of the subdirectories.
This unifies all these files into a master file for the whole project, making it easier to know where to look at and edit if changes needs to be done.
Signed-off-by David Sommerseth <[email protected]...>--- .gitignore | 5 +++++ sample/sample-keys/.gitignore | 1 - tests/unit_tests/.gitignore | 1 - vendor/.gitignore | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 sample/sample-keys/.gitignore delete mode 100644 tests/unit_tests/.gitignore delete mode 100644 vendor/.gitignore.gitignore +1
-0@@ -51,11 +51,16 @@ config-msvc-local.h config-msvc-version.h doc/openvpn.8.html distro/rpm/openvpn.spec +sample/sample-keys/sample-ca/
.gitignore config-msvc-local.h · line 64
Quoted 10 lines
.gitignore +4
-0+vendor/.build +vendor/dist tests/t_client.sh tests/t_client-*-20??????-??????/ t_client.rc t_client_ips.rc +tests/unit_tests/*/*_testdriver +tests/unit_tests/*/*/*_testdriver
What about tests/unit_tests/**/*_testdriver ? As of git 1.8.2 that should match all subfolders, which is old enough to be present on almost all development machines, I think.
Quoted 25 lines
.gitignore +0
-0src/openvpn/openvpn include/openvpn-plugin.hsample/sample-keys/.gitignore deleted +0
-1@@ -1 +0,0 @@ -sample-ca/tests/unit_tests/.gitignore deleted +0
-1@@ -1 +0,0 @@ -*_testdrivervendor/.gitignore deleted +0
-3@@ -1,2 +0,0 @@ -.build/ -dist/ --
Quoted 1 line
2.11.0
ACK, whether you decide to follow my suggestion or not.
-Steffan
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Your patch has been applied to the following branches
commit d14b3c60c7796736e07bc3cddb0ab3a58475793e (master) commit 61da0031b2a0036680d9e0f822619ecc116f1178 (release/2.3) commit 2a7c994ca5b1583bc0f78c46be5b3a827f970b9a (release/2.4) Author: David Sommerseth Date: Fri Jan 20 22:04:57 2017 +0100
git: Merge .gitignore files into a single file
Signed-off-by: David Sommerseth <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg13916.html
Signed-off-by: David Sommerseth <[email protected]...>- --
kind regards,
David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAEBAgAGBQJYhU0KAAoJEIbPlEyWcf3yQHUP+wWvc4RKptkUIKf1mMUMqkPI zW0aFe9JuplvY8i4fuYK0Qw6iul66K36oQiBwAq/lLDy6sCFCmeq9VSSX8gnxP0/ DJzt3vmOMmXNYkw18DCSCdKM/ZLTGYFgoQ4nVtvw+0e2euwG2CKPKSCvOX8L8KM2 tkQPqKMYCb+e0Lng7vxnh0vcoaKJCyYYFFKXdJBwLL0fYl8jvEC+9uXd1rpNmoJ3 0/074gsiuNA0n3cFmVVXspnKbkRHEN3jUFKrFngRsJlTa6CPX0+VYEwb9CWNoW6/ Kp9U9bQGvoOVexm80epEPP2/2DiTLjCVNjL7eVPUwnOr9qdwpnshsqlw5V3IRCAj v0gbbyNPN7pBguPedvre+3hkFWvW/6GAkRJAB201ySxD3MO6cXqtV4inCI3fiDaF 7Hns5oYqRjnr4svPG+zPwTlJw1WWnobuHHYY/LRf+GqwO4+8Ie5osDlxsiHJYGRk vBVzDF2AEVQ8yR/E03l3/uqHeL/b2JBxCPJmZplBl9voKSkAky3CZZHi3w0FIF5m 0POi7kUgyfmvyLA8gGBky9U+S8lLIN8O+xhQcvmYd+KMhZ1oG7kQStK/nUFDXbvi lutR8XWRkJWSV+OkelDmbnahHnwmbDI95RgXEUjUeJlqqJ51RptrDjAvIl4WSqqZ Bd8ikrsLT8mN8NWQXcmB
=GYg7
-----END PGP SIGNATURE-----
Quoted 8 lines · David Sommerseth
Your patch has been applied to the following branches
commit d14b3c60c7796736e07bc3cddb0ab3a58475793e (master) commit 61da0031b2a0036680d9e0f822619ecc116f1178 (release/2.3) commit 2a7c994ca5b1583bc0f78c46be5b3a827f970b9a (release/2.4) Author: David Sommerseth Date: Fri Jan 20 22:04:57 2017 +0100
Quoted 8 lines
git: Merge .gitignore files into a single file
Signed-off-by: David Sommerseth <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg13916.html
Signed-off-by: David Sommerseth <[email protected]...>I forgot to mention I used the trick Steffan pointed out, using tests/unit_tests/**/*_testdriver. I was not aware of that approach, so thanks for pointing that one out, Steffan!
I also chose to apply this to release/2.3, as the difference was minimal and having the same set of files ignored makes it far more predictable.
Signature · 4 lines
kind regards, David Sommerseth OpenVPN Technologies, Inc