.gitignore: Make match patterns more specific

In subdirectories we mostly only want to match at the current level,
not in nested subdirectories.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/bus/.gitignore b/bus/.gitignore
index feeeee391ef940fce35337d123e3595fbdc4148d..6a6035cbce73e72f50d7c3b25d024a3c1c157a93 100644 (file)
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -1,18 +1,18 @@
-dbus-daemon
-dbus-daemon-activation-helper
-dbus-daemon-activation-helper-test
-dbus-daemon-launch-helper
-dbus-daemon-launch-helper-test
-test-bus
-rc.messagebus
-messagebus
-messagebus-config
-session.conf
-system.conf
-test-bus-launch-helper
-test-bus-system
-dbus.service
-dbus.socket
-org.freedesktop.dbus-session.plist
-example-session-disable-stats.conf
-example-system-enable-stats.conf
+/dbus-daemon
+/dbus-daemon-activation-helper
+/dbus-daemon-activation-helper-test
+/dbus-daemon-launch-helper
+/dbus-daemon-launch-helper-test
+/test-bus
+/rc.messagebus
+/messagebus
+/messagebus-config
+/session.conf
+/system.conf
+/test-bus-launch-helper
+/test-bus-system
+/dbus.service
+/dbus.socket
+/org.freedesktop.dbus-session.plist
+/example-session-disable-stats.conf
+/example-system-enable-stats.conf

diff --git a/dbus/.gitignore b/dbus/.gitignore
index 35d8df956cb1b38ced1acc9415b665bd955db528..4be8f582312d4d47f94eccf1feda52ccbef02731 100644 (file)
--- a/dbus/.gitignore
+++ b/dbus/.gitignore
@@ -1,4 +1,4 @@
-test-dbus
-dbus-arch-deps.h
-.dbus-keyrings
-versioninfo.rc
+/test-dbus
+/dbus-arch-deps.h
+/.dbus-keyrings
+/versioninfo.rc

diff --git a/doc/.gitignore b/doc/.gitignore
index fae2a22fe0aa647214a37b5f5481993fce66bb66..8efeb64e1a2424e9a39c6d19da9b46316efde524 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,22 +1,22 @@
 *.1
 *.1.xml
 *.1.html
-api
+/api/
 /dbus.devhelp2
-dbus-specification.html
-dbus-test-plan.html
-dbus-tutorial.html
-dbus-faq.html
-dbus-docs
-dbus-docs.tar.xz
-doxygen.stamp
-dbus-api-design.page
-dbus-api-design.html
+/dbus-specification.html
+/dbus-test-plan.html
+/dbus-tutorial.html
+/dbus-faq.html
+/dbus-docs/
+/dbus-docs.tar.xz
+/doxygen.stamp
+/dbus-api-design.page
+/dbus-api-design.html
 /highlight.pack.js
-jquery.js
-jquery.syntax.brush.html.js
-jquery.syntax.core.js
-jquery.syntax.js
-jquery.syntax.layout.yelp.js
-yelp.js
-C.css
+/jquery.js
+/jquery.syntax.brush.html.js
+/jquery.syntax.core.js
+/jquery.syntax.js
+/jquery.syntax.layout.yelp.js
+/yelp.js
+/C.css

diff --git a/test/.gitignore b/test/.gitignore
index 48bfbcd32b506acc9af41f304057a949631a6287..3181971fc0948a95b6d6cdcbd32db060f1d470b8 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,23 +1,23 @@
-test-bus
-test-spawn
-test-corrupt
-test-exit
-test-segfault
-test-service
-test-sleep-forever
-test-shell
-test-shell-service
-test-names
-test-loopback
-test-relay
-test-dbus-daemon
-test-marshal
-manual-authz
-manual-dir-iter
-manual-tcp
-test-dbus-daemon-eavesdrop
-test-printf
+/test-bus
+/test-spawn
+/test-corrupt
+/test-exit
+/test-segfault
+/test-service
+/test-sleep-forever
+/test-shell
+/test-shell-service
+/test-names
+/test-loopback
+/test-relay
+/test-dbus-daemon
+/test-marshal
+/manual-authz
+/manual-dir-iter
+/manual-tcp
+/test-dbus-daemon-eavesdrop
+/test-printf
 /test-privserver
-test-refs
-test-syntax
-test-syslog
+/test-refs
+/test-syntax
+/test-syslog

diff --git a/test/data/invalid-service-files-system/.gitignore b/test/data/invalid-service-files-system/.gitignore
index 0e3ad1b06cc8068b7dff321d1450398b5c2c455e..f3a2abe7b3bbe5ca6d7ca9bd3f6607e2decb9812 100644 (file)
--- a/test/data/invalid-service-files-system/.gitignore
+++ b/test/data/invalid-service-files-system/.gitignore
@@ -1 +1 @@
-*.service
+/*.service

diff --git a/test/data/valid-config-files/.gitignore b/test/data/valid-config-files/.gitignore
index b6929096bd7a7c5124334b03dcd2f9a13dfbbb35..773c9f79a14d0e3fa560b5878d772dcfa91cfe89 100644 (file)
--- a/test/data/valid-config-files/.gitignore
+++ b/test/data/valid-config-files/.gitignore
@@ -1,6 +1,20 @@
-debug-allow-all.conf
-debug-allow-all-sha1.conf
-incoming-limit.conf
-session.conf
-run-with-tmp-session-bus.conf
-finite-timeout.conf
+/as-another-user.conf
+/count-fds.conf
+/debug-allow-all.conf
+/debug-allow-all-sha1.conf
+/forbidding.conf
+/incoming-limit.conf
+/limit-containers.conf
+/max-completed-connections.conf
+/max-connections-per-user.conf
+/max-containers.conf
+/max-match-rules-per-connection.conf
+/max-names-per-connection.conf
+/max-replies-per-connection.conf
+/multi-user.conf
+/pending-fd-timeout.conf
+/session.conf
+/systemd-activation.conf
+/tmp-session.conf
+/run-with-tmp-session-bus.conf
+/finite-timeout.conf

diff --git a/test/data/valid-service-files-system/.gitignore b/test/data/valid-service-files-system/.gitignore
index 0e3ad1b06cc8068b7dff321d1450398b5c2c455e..f3a2abe7b3bbe5ca6d7ca9bd3f6607e2decb9812 100644 (file)
--- a/test/data/valid-service-files-system/.gitignore
+++ b/test/data/valid-service-files-system/.gitignore
@@ -1 +1 @@
-*.service
+/*.service

diff --git a/test/data/valid-service-files/.gitignore b/test/data/valid-service-files/.gitignore
index 0e3ad1b06cc8068b7dff321d1450398b5c2c455e..f3a2abe7b3bbe5ca6d7ca9bd3f6607e2decb9812 100644 (file)
--- a/test/data/valid-service-files/.gitignore
+++ b/test/data/valid-service-files/.gitignore
@@ -1 +1 @@
-*.service
+/*.service

diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore
index da07c6111c9bf2054f69636853784e76ef2cbb36..619746ad8d5bc85284c651e57045984a94cbb05e 100644 (file)
--- a/test/name-test/.gitignore
+++ b/test/name-test/.gitignore
@@ -1,9 +1,9 @@
-tmp-session-bus.*.conf
-test-ids
-test-names
-test-pending-call-dispatch
-test-pending-call-timeout
-test-privserver-client
-test-shutdown
-test-threads-init
-test-autolaunch
+/tmp-session-bus.*.conf
+/test-ids
+/test-names
+/test-pending-call-dispatch
+/test-pending-call-timeout
+/test-privserver-client
+/test-shutdown
+/test-threads-init
+/test-autolaunch

diff --git a/tools/.gitignore b/tools/.gitignore
index c7f2090a01a1dfa4ebc0ccc2a5ce4e2f4e5d5d89..f075311694dd518b1620641a19f4c787fd603441 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,8 +1,8 @@
-dbus-send
-dbus-monitor
-dbus-cleanup-sockets
-dbus-launch
-dbus-uuidgen
-dbus-run-session
-run-with-tmp-session-bus.conf
-dbus-test-tool
+/dbus-send
+/dbus-monitor
+/dbus-cleanup-sockets
+/dbus-launch
+/dbus-uuidgen
+/dbus-run-session
+/run-with-tmp-session-bus.conf
+/dbus-test-tool