patch 8.2.4962: files show up in git status
Problem: Files show up in git status.
Solution: Adjust the list of ignored files. Clean up more test files.
(Shane xb Qian, closes #9929)
diff --git a/.gitignore b/.gitignore
index 72143d9..8c330f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
src/auto/os_haiku.rdef
src/objects/.dirstamp
src/objects
-src/tags
src/types.vim
# We do need src/auto/configure.
@@ -62,6 +61,11 @@
*.pyc
*.log
src/po/vim.pot
+src/tags
+/tags
+/GPATH
+/GTAGS
+/GRTAGS
# Generated by "make test"
src/po/*.ck
@@ -86,7 +90,6 @@
src/kword_test
# Generated by "make install"
-runtime/doc/tags
runtime/doc/doctags
# Generated by "make shadow". The directory names could be anything but we
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 3f33bf8..c54e060 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -18,7 +18,7 @@
# The output goes into a file "valgrind.testN"
# Vim should be compiled with EXITFREE to avoid false warnings.
# This will make testing about 10 times as slow.
-# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind.$*
+# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=35 --log-file=valgrind.$*
default: nongui
@@ -86,7 +86,7 @@
clean:
-rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind
-rm -f opt_test.vim test.log test_result.log messages
- -rm -f $(RM_ON_RUN) $(RM_ON_START)
+ -rm -rf $(RM_ON_RUN) $(RM_ON_START)
-rm -f valgrind.*
-rm -f asan.*
diff --git a/src/version.c b/src/version.c
index b8fb438..1a33a73 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4962,
+/**/
4961,
/**/
4960,