From: Rhys Kidd <rhyskidd@gmail.com>
Date: Mon, 2 Oct 2017 00:57:04 +0000 (-0400)
Subject: gitignore: Fix up false directory-level .gitignore settings
X-Git-Tag: VALGRIND_3_14_0~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7221d28cad21d44ebd73750b64229e9457034659;p=thirdparty%2Fvalgrind.git

gitignore: Fix up false directory-level .gitignore settings

So we never intended to ignore all changes from the top-level down in /include
or /cachegrind. Instead allow the filetype-specific .gitignore patterns match
to the contents of these two folders.

Also, don't ignore changes to include/valgrind.h as it exists in the repository
and should be tracked for any changes developers might make.

Changes tested by running a git clean force and then full rebuild. No stray
build artifacts were being tracked erroneously by git after these changes.
---

diff --git a/.gitignore b/.gitignore
index ba06188c60..ec612170d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 /autom4te-*.cache
 /autom4te.cache
 /bin
-/cachegrind
 /cachegrind.out.*
 /compile
 /config.guess
@@ -19,7 +18,6 @@
 /default.supp
 /depcomp
 /glibc-2.X.supp
-/include
 /install-sh
 /lib
 /Makefile
@@ -694,7 +692,6 @@
 /include/Makefile.in
 /include/Makefile
 /include/tool.h
-/include/valgrind.h
 /include/vgversion.h
 
 # /include/vki/