From d3fffaa72fd372baeba34b4a891b7edfb3211bb5 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 14 Dec 2018 12:51:51 +0000
Subject: [PATCH] .gitignore: Normalize into LC_ALL=C sort order

If lists are in a completely arbitrary order, sorting them consistently
means that there is only one correct place to insert a new entry, avoiding
the merge conflicts that would occur if we always append new entries.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 bus/.gitignore                          | 14 ++++++-------
 dbus/.gitignore                         |  4 ++--
 doc/.gitignore                          | 16 +++++++--------
 test/.gitignore                         | 26 ++++++++++++-------------
 test/data/valid-config-files/.gitignore |  6 +++---
 test/name-test/.gitignore               |  4 ++--
 tools/.gitignore                        |  8 ++++----
 7 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/bus/.gitignore b/bus/.gitignore
index 6a6035cbc..5bf893d74 100644
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -3,16 +3,16 @@
 /dbus-daemon-activation-helper-test
 /dbus-daemon-launch-helper
 /dbus-daemon-launch-helper-test
-/test-bus
-/rc.messagebus
+/dbus.service
+/dbus.socket
+/example-session-disable-stats.conf
+/example-system-enable-stats.conf
 /messagebus
 /messagebus-config
+/org.freedesktop.dbus-session.plist
+/rc.messagebus
 /session.conf
 /system.conf
+/test-bus
 /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 4be8f5823..49ce24ad3 100644
--- a/dbus/.gitignore
+++ b/dbus/.gitignore
@@ -1,4 +1,4 @@
-/test-dbus
-/dbus-arch-deps.h
 /.dbus-keyrings
+/dbus-arch-deps.h
+/test-dbus
 /versioninfo.rc
diff --git a/doc/.gitignore b/doc/.gitignore
index 8efeb64e1..2f6d71baa 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,17 +1,18 @@
 *.1
-*.1.xml
 *.1.html
+*.1.xml
+/C.css
 /api/
-/dbus.devhelp2
+/dbus-api-design.html
+/dbus-api-design.page
+/dbus-docs.tar.xz
+/dbus-docs/
+/dbus-faq.html
 /dbus-specification.html
 /dbus-test-plan.html
 /dbus-tutorial.html
-/dbus-faq.html
-/dbus-docs/
-/dbus-docs.tar.xz
+/dbus.devhelp2
 /doxygen.stamp
-/dbus-api-design.page
-/dbus-api-design.html
 /highlight.pack.js
 /jquery.js
 /jquery.syntax.brush.html.js
@@ -19,4 +20,3 @@
 /jquery.syntax.js
 /jquery.syntax.layout.yelp.js
 /yelp.js
-/C.css
diff --git a/test/.gitignore b/test/.gitignore
index 3181971fc..90aeac4a4 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,23 +1,23 @@
+/manual-authz
+/manual-dir-iter
+/manual-tcp
 /test-bus
-/test-spawn
 /test-corrupt
+/test-dbus-daemon
+/test-dbus-daemon-eavesdrop
 /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-names
 /test-printf
 /test-privserver
 /test-refs
+/test-relay
+/test-segfault
+/test-service
+/test-shell
+/test-shell-service
+/test-sleep-forever
+/test-spawn
 /test-syntax
 /test-syslog
diff --git a/test/data/valid-config-files/.gitignore b/test/data/valid-config-files/.gitignore
index 773c9f79a..95aa207a2 100644
--- a/test/data/valid-config-files/.gitignore
+++ b/test/data/valid-config-files/.gitignore
@@ -1,7 +1,8 @@
 /as-another-user.conf
 /count-fds.conf
-/debug-allow-all.conf
 /debug-allow-all-sha1.conf
+/debug-allow-all.conf
+/finite-timeout.conf
 /forbidding.conf
 /incoming-limit.conf
 /limit-containers.conf
@@ -13,8 +14,7 @@
 /max-replies-per-connection.conf
 /multi-user.conf
 /pending-fd-timeout.conf
+/run-with-tmp-session-bus.conf
 /session.conf
 /systemd-activation.conf
 /tmp-session.conf
-/run-with-tmp-session-bus.conf
-/finite-timeout.conf
diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore
index 619746ad8..0e47bfeda 100644
--- a/test/name-test/.gitignore
+++ b/test/name-test/.gitignore
@@ -1,4 +1,4 @@
-/tmp-session-bus.*.conf
+/test-autolaunch
 /test-ids
 /test-names
 /test-pending-call-dispatch
@@ -6,4 +6,4 @@
 /test-privserver-client
 /test-shutdown
 /test-threads-init
-/test-autolaunch
+/tmp-session-bus.*.conf
diff --git a/tools/.gitignore b/tools/.gitignore
index f07531169..839647b95 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,8 +1,8 @@
-/dbus-send
-/dbus-monitor
 /dbus-cleanup-sockets
 /dbus-launch
-/dbus-uuidgen
+/dbus-monitor
 /dbus-run-session
-/run-with-tmp-session-bus.conf
+/dbus-send
 /dbus-test-tool
+/dbus-uuidgen
+/run-with-tmp-session-bus.conf
-- 
2.47.3