From 60e3b480fbd71d643f10d04bf668c592a330199c Mon Sep 17 00:00:00 2001 From: Teemu Murtola Date: Sat, 20 Sep 2014 08:40:01 +0300 Subject: [PATCH] Fix patterns for .gitattributes In different contexts, git treats a trailing wildcard pattern differently, and in .gitattributes it does not apply recursively. A double star would, but at least the last time I tried, it did not work with the version of git that runs on Jenkins. Change-Id: Iac53b755a2931e8cd3ccdb6169346b0631715986 --- .gitattributes | 1 - src/external/.gitattributes | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index bb30b7748d..1f069f1777 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,7 +34,6 @@ docs/manual/UseLATEX.cmake !filter scripts/GMXRC.* !filter scripts/make_gromos_rtp.py !filter src/contrib/* -filter -gmx-doxygen -src/external/* -filter -gmx-doxygen src/gromacs/gmxlib/nonbonded/preprocessor/gmxpreprocess.py !filter src/gromacs/linearalgebra/gmx_blas/* !filter src/gromacs/linearalgebra/gmx_lapack/* !filter diff --git a/src/external/.gitattributes b/src/external/.gitattributes index 5c61d8f626..24cfcc74ca 100644 --- a/src/external/.gitattributes +++ b/src/external/.gitattributes @@ -1 +1,4 @@ +# Only recent versions of git support pattern matching rules that would allow +# the first to be conveniently specified in the main .gitattributes file. +* -filter -gmx-doxygen gmock-1.7.0/CMakeLists.txt filter=copyright -- 2.22.0