Re: [Openvpn-devel] [PATCH] git: Merge .gitignore files into a single file

2017-01-22 Thread Steffan Karger 
Hi,

On 20 January 2017 at 22:04, David Sommerseth  wrote:
> 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 
> ---
>  .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
>
> diff --git a/.gitignore b/.gitignore
> index fc1e223..72593cf 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -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
>

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.

>  src/openvpn/openvpn
>  include/openvpn-plugin.h
> diff --git a/sample/sample-keys/.gitignore b/sample/sample-keys/.gitignore
> deleted file mode 100644
> index f148752..000
> --- a/sample/sample-keys/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -sample-ca/
> diff --git a/tests/unit_tests/.gitignore b/tests/unit_tests/.gitignore
> deleted file mode 100644
> index 8655de8..000
> --- a/tests/unit_tests/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -*_testdriver
> diff --git a/vendor/.gitignore b/vendor/.gitignore
> deleted file mode 100644
> index e11dfec..000
> --- a/vendor/.gitignore
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -.build/
> -dist/
> --
> 2.11.0

ACK, whether you decide to follow my suggestion or not.

-Steffan

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH] git: Merge .gitignore files into a single file

2017-01-20 Thread 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 
---
 .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

diff --git a/.gitignore b/.gitignore
index fc1e223..72593cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/sample/sample-keys/.gitignore b/sample/sample-keys/.gitignore
deleted file mode 100644
index f148752..000
--- a/sample/sample-keys/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-sample-ca/
diff --git a/tests/unit_tests/.gitignore b/tests/unit_tests/.gitignore
deleted file mode 100644
index 8655de8..000
--- a/tests/unit_tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*_testdriver
diff --git a/vendor/.gitignore b/vendor/.gitignore
deleted file mode 100644
index e11dfec..000
--- a/vendor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.build/
-dist/
-- 
2.11.0


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel