Clean up the .gitignore file:
- Remove no longer used .gitignore entries, like .bzr files
- Do not repeat autotools generated files over and over again
- Whitelist existent Makefiles in the repository
- Better separate the .gitignore entries

===========

When porting Jan's patches downstream, I had hard time merging changes to
/Makefile in the repository as it was stated in .gitignore which made git (and
me) suffer. I fixed that by whitelisting this one.

Unfortunately, when I saw other entries in .gitignore I could not resist and
refactored the file to make it (hopefully) simpler and easier to maintain.

Martin
From db6309ad7117ea397f82c4394b995c0116674332 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mko...@redhat.com>
Date: Mon, 9 Dec 2013 17:36:07 +0100
Subject: [PATCH] Consolidate .gitignore entries

Clean up the .gitignore file:
- Remove no longer used .gitignore entries, like .bzr files
- Do not repeat autotools generated files over and over again
- Whitelist existent Makefiles in the repository
- Better separate the .gitignore entries
---
 .bzrignore |   2 -
 .gitignore | 140 ++++++++++++++++++++++++++-----------------------------------
 2 files changed, 59 insertions(+), 83 deletions(-)
 delete mode 100644 .bzrignore

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 3d1eb87418ef1023620a265b8f7cdeff21a30741..0000000000000000000000000000000000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.git
-freeipa2-dev-doc
diff --git a/.gitignore b/.gitignore
index 96c151a192e9ee890d1e9e45ae32a2bba06704c0..db213497202fc1ba904d3fc1b9ccea2ec5be3068 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+# In-tree build files
 configure
 config.h
 config.h.in
@@ -9,86 +10,63 @@ Makefile.in
 *.lo
 *.log
 *.o
-*.pyc
 *.trs
-.bzr
-freeipa2-dev-doc
-build
-dist/
-RELEASE
-daemons/AUTHORS
-daemons/COPYING
-daemons/ChangeLog
-daemons/INSTALL
-daemons/NEWS
-daemons/README
-daemons/aclocal.m4
-daemons/autom4te.cache/
-daemons/config.guess
-daemons/config.log
-daemons/config.status
-daemons/config.sub
-daemons/depcomp
-daemons/install-sh
-daemons/ipa-otpd/ipa-otpd
-daemons/ipa-otpd/ipa-otpd.socket
-daemons/ipa-otpd/ipa-otpd@.service
-daemons/ipa-version.h
-daemons/libtool
-daemons/ltmain.sh
-daemons/missing
-daemons/stamp-h1
-daemons/test-driver
-install/AUTHORS
-install/COPYING
-install/ChangeLog
-install/INSTALL
-install/NEWS
-install/README
-install/aclocal.m4
-install/autom4te.cache/
-install/config.log
-install/config.status
-install/install-sh
-install/missing
-install/stamp-h1
-install/po/test.po
-install/po/test_locale/xh_ZA/LC_MESSAGES/ipa.mo
-install/ui/release
-install/ui/src/dojo
-install/ui/src/build
-install/ui/src/libs/loader.js
-install/ui/src/plugins
-ipa-client/COPYING
-ipa-client/ChangeLog
-ipa-client/INSTALL
-ipa-client/aclocal.m4
-ipa-client/autom4te.cache/
-ipa-client/config.guess
-ipa-client/config.log
-ipa-client/config.status
-ipa-client/config.sub
-ipa-client/depcomp
-ipa-client/install-sh
-ipa-client/ipa-client.spec
-ipa-client/ipa-getkeytab
-ipa-client/ipa-join
-ipa-client/ipa-rmkeytab
-ipa-client/libtool
-ipa-client/ltmain.sh
-ipa-client/missing
-ipa-client/py-compile
-ipa-client/stamp-h1
-ipa-client/version.m4
-ipatests/test_xmlrpc/service.crt
-ipatests/man/aclocal.m4
-ipatests/man/autom4te.cache/
-ipatests/man/config.status
-ipatests/man/install-sh
-ipatests/man/missing
-freeipa.spec
-ipapython/setup.py
-ipapython/version.py
 version.m4
-ipapython/services.py
-ipatests/setup.py
+aclocal.m4
+autom4te.cache/
+config.guess
+config.log
+config.status
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+stamp-h1
+libtool
+build/
+
+# Python compilation
+*.pyc
+py-compile
+
+# Developer documentation
+freeipa2-dev-doc
+~/doc/guide/Makefile
+
+# Root directory
+/freeipa.spec
+!/Makefile
+/dist/
+/RELEASE
+
+# Subdirectories
+/daemons/ipa-otpd/ipa-otpd
+/daemons/ipa-otpd/ipa-otpd.socket
+/daemons/ipa-otpd/ipa-otpd@.service
+/daemons/ipa-version.h
+/daemons/test-driver
+
+/install/po/test.po
+/install/po/test_locale/xh_ZA/LC_MESSAGES/ipa.mo
+!/install/ui/doc/Makefile.in
+/install/ui/release
+/install/ui/src/dojo
+/install/ui/src/build
+/install/ui/src/libs/loader.js
+/install/ui/src/plugins
+!/install/ui/doc/Makefile
+
+/ipa-client/ipa-client.spec
+/ipa-client/ipa-getkeytab
+/ipa-client/ipa-join
+/ipa-client/ipa-rmkeytab
+
+/ipatests/test_xmlrpc/service.crt
+/ipatests/setup.py
+
+/ipapython/setup.py
+/ipapython/version.py
+/ipapython/services.py
+!/ipapython/Makefile
+!/ipapython/py_default_encoding/Makefile
-- 
1.8.3.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to