# HG changeset patch # User Bram Moolenaar # Date 1652696104 -7200 # Node ID 73d490493dc6b046be294a302cc47506a7fc0b6e # Parent 3e05c671c2fa5b3986a2d4a1c82ab66e83c2bc15 patch 8.2.4962: files show up in git status Commit: https://github.com/vim/vim/commit/5a8fad32ea9c075f045b37d6c7739891d458f82b Author: shane.xb.qian Date: Mon May 16 11:14:09 2022 +0100 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 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ src/auto/gui_gtk_gresources.h 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 @@ src/xxd/xxd.dSYM *.pyc *.log src/po/vim.pot +src/tags +/tags +/GPATH +/GTAGS +/GRTAGS # Generated by "make test" src/po/*.ck @@ -86,7 +90,6 @@ src/message_test 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 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -18,7 +18,7 @@ REDIR_TEST_TO_NULL = --cmd 'au SwapExist # 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 @@ RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(V 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 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4962, +/**/ 4961, /**/ 4960,