From 0c62a9a5f41261231dc0d63d094ecea25d2bc16b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Dec 2018 12:50:25 +0000 Subject: [PATCH] .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 --- bus/.gitignore | 36 +++++++-------- dbus/.gitignore | 8 ++-- doc/.gitignore | 34 +++++++------- test/.gitignore | 44 +++++++++---------- .../invalid-service-files-system/.gitignore | 2 +- test/data/valid-config-files/.gitignore | 26 ++++++++--- .../valid-service-files-system/.gitignore | 2 +- test/data/valid-service-files/.gitignore | 2 +- test/name-test/.gitignore | 18 ++++---- tools/.gitignore | 16 +++---- 10 files changed, 101 insertions(+), 87 deletions(-) diff --git a/bus/.gitignore b/bus/.gitignore index feeeee391..6a6035cbc 100644 --- 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 35d8df956..4be8f5823 100644 --- 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 fae2a22fe..8efeb64e1 100644 --- 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 48bfbcd32..3181971fc 100644 --- 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 0e3ad1b06..f3a2abe7b 100644 --- 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 b6929096b..773c9f79a 100644 --- 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 0e3ad1b06..f3a2abe7b 100644 --- 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 0e3ad1b06..f3a2abe7b 100644 --- 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 da07c6111..619746ad8 100644 --- 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 c7f2090a0..f07531169 100644 --- 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 -- 2.47.3