From 39cec292445020e2a0f049f21ad027cbd7d39408 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 12 Apr 2016 10:56:55 +0200
Subject: [PATCH] CLEANUP: .gitignore cleanup

.gitignore is an odd beast. All the stuff at the beginning is useless
since in the bottom part starts with /.* and /*. Therefore, the top part
is useless. Moreover, the bottom part makes unignore *.o and
friends. Add it back at the bottom.
---
 .gitignore | 62 ++++++++++++------------------------------------------
 1 file changed, 14 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0292bcc1b4..b9d630c9b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,3 @@
-*.o
-*/.svn
-*~
-.flxdisk*
-.flxpkg
-.flxstatus*
-.svn
-haproxy
-src/*.o
-*.rej
-*.orig
-*.log*
-*.trace*
-haproxy-*
-!doc/haproxy-*.txt
-!src/*.c
-make-*
-dlmalloc.c
-00*.patch
-*.service
-*.bak
-.nfs*
-contrib/base64/base64rev
-contrib/halog/halog
-contrib/ip6range/ip6range
-contrib/iprange/iprange
-tests/test_hashes
-/*.cfg
-/*.conf
-/*.diff
-/*.patch
-/*.c
-/*.o
-/*.so
-/*.txt
-/*.TXT
-/*.txt.*
-/*.prof
-/*.gprof
-/*.prof.*
-/*.gprof.*
-/*.tar
-/*.tar.gz
-/*.tgz
-/*.mbox
-/*.sh
-/bug*
-/TAGS
 # Below we forbid everything and only allow what we know, that's much easier
 # than blocking about 500 different test files and bug report outputs.
 /.*
@@ -69,3 +21,17 @@ tests/test_hashes
 !/src
 !/tests
 !/debian
+# Reject some generic files
+*.o
+*~
+*.rej
+*.orig
+*.bak
+# And reject some specific files
+/contrib/base64/base64rev
+/contrib/halog/halog
+/contrib/ip6range/ip6range
+/contrib/iprange/iprange
+/contrib/systemd/haproxy.service
+/src/dlmalloc.c
+/tests/test_hashes