patch 8.1.2182: test42 seen as binary by git diff

Problem:    Test42 seen as binary by git diff.
Solution:   Add .gitattributes file.  Make explicit that 'cpo' does not
            contain 'S'. (Daniel Hahler, closes #5072)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..9216dbe
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+src/testdir/test42.in diff

diff --git a/Filelist b/Filelist
index e79cbb791ef4ffcc42eea31acf417985c84ac29f..a2b9f0adb74a34291f04f420f507ebb55cc349ec 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -4,6 +4,7 @@
 # source files for all source archives
 SRC_ALL =      \
                .gitignore \
+               .gitattributes \
                .hgignore \
                .lgtm.yml \
                .travis.yml \

diff --git a/src/testdir/test42.in b/src/testdir/test42.in
index c35569a76c908682eb8e7e7ab8d9a3522d9fa473..1d9d3ab92cd597e8c75fab7763d90cf3906c7da4 100644 (file)
Binary files a/src/testdir/test42.in and b/src/testdir/test42.in differ

diff --git a/src/version.c b/src/version.c
index 0fff97d466b348de63cf30406219231ef685a207..afdc49aeb205fbdb472a4dd912ff7217fa71b3c6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2182,
 /**/
     2181,
 /**/