[PATCH] Consolidate .gitignore files

Todd Zullinger tmz at pobox.com
Fri Oct 30 15:42:30 UTC 2009


Rather than have multiple .gitignore files throughout the repository
(many of which are identical across the various sites), use one
top-level .gitignore.
---

Does anyone mind using a top-level .gitignore instead of individual
.gitignore files?

Also, I was thinkig I'd push this only to master.  We're getting close
enough to the release that it shouldn't cause us any merge grief with
the f12-beta branch, right?

 .gitignore                                        |   15 +++++++++++++++
 fedorahosted.org/.gitignore                       |    7 -------
 fedorahosted.org/data/templates/.gitignore        |    1 -
 fedorahosted.org/httpd/conf/.gitignore            |    3 ---
 fedorahosted.org/httpd/logs/.gitignore            |    1 -
 fedorahosted.org/httpd/run/.gitignore             |    1 -
 fedoraproject.org/.gitignore                      |    7 -------
 fedoraproject.org/build/.gitignore                |    1 -
 fedoraproject.org/data/templates/.gitignore       |    1 -
 fedoraproject.org/httpd/conf/.gitignore           |    3 ---
 fedoraproject.org/httpd/logs/.gitignore           |    1 -
 fedoraproject.org/httpd/run/.gitignore            |    1 -
 spins.fedoraproject.org/.gitignore                |    7 -------
 spins.fedoraproject.org/data/templates/.gitignore |    1 -
 spins.fedoraproject.org/httpd/conf/.gitignore     |    3 ---
 spins.fedoraproject.org/httpd/logs/.gitignore     |    1 -
 spins.fedoraproject.org/httpd/run/.gitignore      |    1 -
 talk.fedoraproject.org/.gitignore                 |    7 -------
 talk.fedoraproject.org/data/templates/.gitignore  |    1 -
 talk.fedoraproject.org/httpd/conf/.gitignore      |    3 ---
 talk.fedoraproject.org/httpd/logs/.gitignore      |    1 -
 talk.fedoraproject.org/httpd/run/.gitignore       |    1 -
 22 files changed, 15 insertions(+), 53 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 fedorahosted.org/.gitignore
 delete mode 100644 fedorahosted.org/data/templates/.gitignore
 delete mode 100644 fedorahosted.org/httpd/conf/.gitignore
 delete mode 100644 fedorahosted.org/httpd/logs/.gitignore
 delete mode 100644 fedorahosted.org/httpd/run/.gitignore
 delete mode 100644 fedoraproject.org/.gitignore
 delete mode 100644 fedoraproject.org/build/.gitignore
 delete mode 100644 fedoraproject.org/data/templates/.gitignore
 delete mode 100644 fedoraproject.org/httpd/conf/.gitignore
 delete mode 100644 fedoraproject.org/httpd/logs/.gitignore
 delete mode 100644 fedoraproject.org/httpd/run/.gitignore
 delete mode 100644 spins.fedoraproject.org/.gitignore
 delete mode 100644 spins.fedoraproject.org/data/templates/.gitignore
 delete mode 100644 spins.fedoraproject.org/httpd/conf/.gitignore
 delete mode 100644 spins.fedoraproject.org/httpd/logs/.gitignore
 delete mode 100644 spins.fedoraproject.org/httpd/run/.gitignore
 delete mode 100644 talk.fedoraproject.org/.gitignore
 delete mode 100644 talk.fedoraproject.org/data/templates/.gitignore
 delete mode 100644 talk.fedoraproject.org/httpd/conf/.gitignore
 delete mode 100644 talk.fedoraproject.org/httpd/logs/.gitignore
 delete mode 100644 talk.fedoraproject.org/httpd/run/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d8b285f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+*.mo
+*.pyc
+*.pyo
+*.swp
+*~
+en.po
+
+*/build/*.cache
+*/data/templates/translations.html
+*/httpd/conf/httpd.conf
+*/httpd/conf/languages.conf
+*/httpd/conf/languages.conf.in
+*/httpd/logs/*_log
+*/httpd/run/*.pid
+*/out/*
diff --git a/fedorahosted.org/.gitignore b/fedorahosted.org/.gitignore
deleted file mode 100644
index 6d38d27..0000000
--- a/fedorahosted.org/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/out/*
-*~
-*.swp
-*.mo
-en.po
-*.pyc
-*.pyo
diff --git a/fedorahosted.org/data/templates/.gitignore b/fedorahosted.org/data/templates/.gitignore
deleted file mode 100644
index 4e587a4..0000000
--- a/fedorahosted.org/data/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-translations.html
diff --git a/fedorahosted.org/httpd/conf/.gitignore b/fedorahosted.org/httpd/conf/.gitignore
deleted file mode 100644
index 23eece0..0000000
--- a/fedorahosted.org/httpd/conf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-httpd.conf
-languages.conf
-languages.conf.in
diff --git a/fedorahosted.org/httpd/logs/.gitignore b/fedorahosted.org/httpd/logs/.gitignore
deleted file mode 100644
index 940728a..0000000
--- a/fedorahosted.org/httpd/logs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*_log
diff --git a/fedorahosted.org/httpd/run/.gitignore b/fedorahosted.org/httpd/run/.gitignore
deleted file mode 100644
index 9fd4f9b..0000000
--- a/fedorahosted.org/httpd/run/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pid
diff --git a/fedoraproject.org/.gitignore b/fedoraproject.org/.gitignore
deleted file mode 100644
index 6d38d27..0000000
--- a/fedoraproject.org/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/out/*
-*~
-*.swp
-*.mo
-en.po
-*.pyc
-*.pyo
diff --git a/fedoraproject.org/build/.gitignore b/fedoraproject.org/build/.gitignore
deleted file mode 100644
index c3ed10e..0000000
--- a/fedoraproject.org/build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cache
diff --git a/fedoraproject.org/data/templates/.gitignore b/fedoraproject.org/data/templates/.gitignore
deleted file mode 100644
index 4e587a4..0000000
--- a/fedoraproject.org/data/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-translations.html
diff --git a/fedoraproject.org/httpd/conf/.gitignore b/fedoraproject.org/httpd/conf/.gitignore
deleted file mode 100644
index 23eece0..0000000
--- a/fedoraproject.org/httpd/conf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-httpd.conf
-languages.conf
-languages.conf.in
diff --git a/fedoraproject.org/httpd/logs/.gitignore b/fedoraproject.org/httpd/logs/.gitignore
deleted file mode 100644
index 940728a..0000000
--- a/fedoraproject.org/httpd/logs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*_log
diff --git a/fedoraproject.org/httpd/run/.gitignore b/fedoraproject.org/httpd/run/.gitignore
deleted file mode 100644
index 9fd4f9b..0000000
--- a/fedoraproject.org/httpd/run/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pid
diff --git a/spins.fedoraproject.org/.gitignore b/spins.fedoraproject.org/.gitignore
deleted file mode 100644
index 6d38d27..0000000
--- a/spins.fedoraproject.org/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/out/*
-*~
-*.swp
-*.mo
-en.po
-*.pyc
-*.pyo
diff --git a/spins.fedoraproject.org/data/templates/.gitignore b/spins.fedoraproject.org/data/templates/.gitignore
deleted file mode 100644
index 4e587a4..0000000
--- a/spins.fedoraproject.org/data/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-translations.html
diff --git a/spins.fedoraproject.org/httpd/conf/.gitignore b/spins.fedoraproject.org/httpd/conf/.gitignore
deleted file mode 100644
index 23eece0..0000000
--- a/spins.fedoraproject.org/httpd/conf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-httpd.conf
-languages.conf
-languages.conf.in
diff --git a/spins.fedoraproject.org/httpd/logs/.gitignore b/spins.fedoraproject.org/httpd/logs/.gitignore
deleted file mode 100644
index 940728a..0000000
--- a/spins.fedoraproject.org/httpd/logs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*_log
diff --git a/spins.fedoraproject.org/httpd/run/.gitignore b/spins.fedoraproject.org/httpd/run/.gitignore
deleted file mode 100644
index 9fd4f9b..0000000
--- a/spins.fedoraproject.org/httpd/run/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pid
diff --git a/talk.fedoraproject.org/.gitignore b/talk.fedoraproject.org/.gitignore
deleted file mode 100644
index 6d38d27..0000000
--- a/talk.fedoraproject.org/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/out/*
-*~
-*.swp
-*.mo
-en.po
-*.pyc
-*.pyo
diff --git a/talk.fedoraproject.org/data/templates/.gitignore b/talk.fedoraproject.org/data/templates/.gitignore
deleted file mode 100644
index 4e587a4..0000000
--- a/talk.fedoraproject.org/data/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-translations.html
diff --git a/talk.fedoraproject.org/httpd/conf/.gitignore b/talk.fedoraproject.org/httpd/conf/.gitignore
deleted file mode 100644
index 23eece0..0000000
--- a/talk.fedoraproject.org/httpd/conf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-httpd.conf
-languages.conf
-languages.conf.in
diff --git a/talk.fedoraproject.org/httpd/logs/.gitignore b/talk.fedoraproject.org/httpd/logs/.gitignore
deleted file mode 100644
index 940728a..0000000
--- a/talk.fedoraproject.org/httpd/logs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*_log
diff --git a/talk.fedoraproject.org/httpd/run/.gitignore b/talk.fedoraproject.org/httpd/run/.gitignore
deleted file mode 100644
index 9fd4f9b..0000000
--- a/talk.fedoraproject.org/httpd/run/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pid
-- 
1.6.5.2

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The more corrupt the state, the more numerous the laws.
    -- Tacitus, Roman senator and historian (A.D. c.56-c.115)




More information about the Fedora-websites-list mailing list