diff options
| author | shane.xb.qian <shane.qian@foxmail.com> | 2022-05-16 11:14:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-16 11:14:09 +0100 |
| commit | 5a8fad32ea9c075f045b37d6c7739891d458f82b (patch) | |
| tree | 535a8ffd68d9cc96f017912c13cf0087f97df378 | |
| parent | 9f28eeb694cec8f5019b8fbde3f92f4a90dc5006 (diff) | |
patch 8.2.4962: files show up in git statusv8.2.4962
Problem: Files show up in git status.
Solution: Adjust the list of ignored files. Clean up more test files.
(Shane xb Qian, closes #9929)
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | src/testdir/Makefile | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 72143d9e79..8c330f32cb 100644 --- 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 index 3f33bf8646..c54e0604bf 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -18,7 +18,7 @@ REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C L # 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) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u un 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 b8fb438fce..1a33a7398e 100644 --- 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, |