[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] maint: consolidate several .gitignore files



Unlike .cvsignore under CVS, git allows for ignoring nested
names.  We weren't very consistent where new tests were
being ignored (some in .gitignore, some in tests/.gitignore),
and I found it easier to just consolidate everything.

* .gitignore: Subsume entries from subdirectories.
* daemon/.gitignore: Delete.
* docs/.gitignore: Likewise.
* docs/devhelp/.gitignore: Likewise.
* docs/html/.gitignore: Likewise.
* examples/dominfo/.gitignore: Likewise.
* examples/domsuspend/.gitignore: Likewise.
* examples/hellolibvirt/.gitignore: Likewise.
* examples/openauth/.gitignore: Likewise.
* examples/domain-events/events-c/.gitignore: Likewise.
* include/libvirt/.gitignore: Likewise.
* src/.gitignore: Likewise.
* src/esx/.gitignore: Likewise.
* tests/.gitignore: Likewise.
* tools/.gitignore: Likewise.
---
 .gitignore                                 |   75 +++++++++++++++++++++++++++-
 daemon/.gitignore                          |   15 ------
 docs/.gitignore                            |    8 ---
 docs/devhelp/.gitignore                    |    4 --
 docs/html/.gitignore                       |    1 -
 examples/domain-events/events-c/.gitignore |    6 --
 examples/dominfo/.gitignore                |    5 --
 examples/domsuspend/.gitignore             |    5 --
 examples/hellolibvirt/.gitignore           |    5 --
 examples/openauth/.gitignore               |    5 --
 include/libvirt/.gitignore                 |    3 -
 python/.gitignore                          |   13 -----
 src/.gitignore                             |   22 --------
 src/esx/.gitignore                         |    1 -
 tests/.gitignore                           |   44 ----------------
 tools/.gitignore                           |   14 -----
 16 files changed, 73 insertions(+), 153 deletions(-)
 delete mode 100644 daemon/.gitignore
 delete mode 100644 docs/.gitignore
 delete mode 100644 docs/devhelp/.gitignore
 delete mode 100644 docs/html/.gitignore
 delete mode 100644 examples/domain-events/events-c/.gitignore
 delete mode 100644 examples/dominfo/.gitignore
 delete mode 100644 examples/domsuspend/.gitignore
 delete mode 100644 examples/hellolibvirt/.gitignore
 delete mode 100644 examples/openauth/.gitignore
 delete mode 100644 include/libvirt/.gitignore
 delete mode 100644 python/.gitignore
 delete mode 100644 src/.gitignore
 delete mode 100644 src/esx/.gitignore
 delete mode 100644 tests/.gitignore
 delete mode 100644 tools/.gitignore

diff --git a/.gitignore b/.gitignore
index d1a4226..3e85e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,28 @@
 *#*#
 *.#*#
 *.a
+*.cov
 *.exe
 *.gcda
 *.gcno
 *.gcov
+*.html
+*.i
 *.la
 *.lo
+*.loT
 *.o
 *.orig
+*.pyc
 *.rej
+*.s
 *~
+.deps
 .git
 .git-module-status
+.libs
 .lvimrc
+.memdump
 .sc-start-sc_*
 /ABOUT-NLS
 /COPYING
@@ -37,11 +46,30 @@
 /configure
 /configure.lineno
 /daemon/*_dispatch.h
+/daemon/libvirt_qemud
+/daemon/libvirtd
+/daemon/libvirtd.init
+/daemon/libvirtd.service
+/daemon/libvirtd*.logrotate
+/daemon/libvirtd.8
+/daemon/libvirtd.8.in
+/daemon/libvirtd.pod
+/daemon/probes.h
+/docs/devhelp/libvirt.devhelp
 /docs/hvsupport.html.in
+/docs/libvirt-api.xml
 /docs/libvirt-qemu-*.xml
+/docs/libvirt-refs.xml
+/docs/todo.html.in
+/examples/domain-events/events-c/event-test
+/examples/dominfo/info1
+/examples/domsuspend/suspend
+/examples/hellolibvirt/hellolibvirt
+/examples/openauth/openauth
 /gnulib/lib/*
 /gnulib/m4/*
 /gnulib/tests/*
+/include/libvirt/libvirt.h
 /libtool
 /libvirt-*.tar.gz
 /libvirt-[0-9]*
@@ -55,31 +83,74 @@
 /mkinstalldirs
 /po/*
 /proxy/
+/python/generated.stamp
 /python/generator.py.stamp
+/python/libvirt-export.c
 /python/libvirt-qemu-export.c
 /python/libvirt-qemu.[ch]
+/python/libvirt.[ch]
+/python/libvirt.py
 /python/libvirt_qemu.py
 /sc_*
+/src/esx/*.generated.*
 /src/hyperv/*.generated.*
-/src/libvirt_iohelper
+/src/libvirt*.def
+/src/libvirt.syms
+/src/libvirt_*.stp
+/src/libvirt_*helper
+/src/libvirt_lxc
 /src/locking/qemu-sanlock.conf
+/src/probes.h
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
 /src/rpc/virkeepaliveprotocol.[ch]
 /src/rpc/virnetprotocol.[ch]
 /src/util/virkeymaps.h
+/src/virt-aa-helper
 /tests/*.log
+/tests/*.pid
+/tests/*xml2*test
+/tests/commandhelper
+/tests/conftest
 /tests/cputest
 /tests/domainsnapshotxml2xmltest
+/tests/esxutilstest
+/tests/eventtest
 /tests/hashtest
 /tests/jsontest
 /tests/networkxml2argvtest
+/tests/nodeinfotest
 /tests/nwfilterxml2xmltest
+/tests/object-locking
+/tests/object-locking-files.txt
+/tests/object-locking.cm[ix]
 /tests/openvzutilstest
+/tests/qemuargv2xmltest
+/tests/qemuhelptest
 /tests/qemuxmlnstest
+/tests/qparamtest
+/tests/reconnect
+/tests/secaatest
+/tests/seclabeltest
+/tests/sexpr2xmltest
 /tests/shunloadtest
+/tests/sockettest
+/tests/ssh
+/tests/statstest
+/tests/utiltest
+/tests/virbuftest
 /tests/virhashtest
-/tools/virt-host-validate
+/tests/virnet*test
+/tests/virshtest
+/tests/vmx2xmltest
+/tests/xencapstest
+/tests/xmconfigtest
+/tools/*.[18]
+/tools/libvirt-guests.init
+/tools/virsh
+/tools/virsh-*-edit.c
+/tools/virt-*-validate
+/tools/virt-sanlock-cleanup
 /update.log
 Makefile
 Makefile.in
diff --git a/daemon/.gitignore b/daemon/.gitignore
deleted file mode 100644
index 2873143..0000000
--- a/daemon/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
-libvirt_qemud
-libvirtd
-libvirtd.init
-libvirtd.service
-libvirtd*.logrotate
-libvirtd.8
-libvirtd.8.in
-libvirtd.pod
-probes.h
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index dd78dd0..0000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-.memdump
-apibuild.pyc
-*.html
-libvirt-api.xml
-libvirt-refs.xml
-todo.html.in
diff --git a/docs/devhelp/.gitignore b/docs/devhelp/.gitignore
deleted file mode 100644
index 9c75b93..0000000
--- a/docs/devhelp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-libvirt.devhelp
-*.html
diff --git a/docs/html/.gitignore b/docs/html/.gitignore
deleted file mode 100644
index 2d19fc7..0000000
--- a/docs/html/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
diff --git a/examples/domain-events/events-c/.gitignore b/examples/domain-events/events-c/.gitignore
deleted file mode 100644
index ed9ac4d..0000000
--- a/examples/domain-events/events-c/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-*.exe
-.deps
-.libs
-event-test
diff --git a/examples/dominfo/.gitignore b/examples/dominfo/.gitignore
deleted file mode 100644
index 4626c13..0000000
--- a/examples/dominfo/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-info1
diff --git a/examples/domsuspend/.gitignore b/examples/domsuspend/.gitignore
deleted file mode 100644
index 02eeb79..0000000
--- a/examples/domsuspend/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-suspend
diff --git a/examples/hellolibvirt/.gitignore b/examples/hellolibvirt/.gitignore
deleted file mode 100644
index b8d036d..0000000
--- a/examples/hellolibvirt/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-hellolibvirt
-.deps
-.libs
diff --git a/examples/openauth/.gitignore b/examples/openauth/.gitignore
deleted file mode 100644
index 1431557..0000000
--- a/examples/openauth/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-openauth
-.deps
-.libs
diff --git a/include/libvirt/.gitignore b/include/libvirt/.gitignore
deleted file mode 100644
index 7bd42da..0000000
--- a/include/libvirt/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-libvirt.h
diff --git a/python/.gitignore b/python/.gitignore
deleted file mode 100644
index c191f74..0000000
--- a/python/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-*.loT
-libvirt.py
-libvirt-export.c
-libvirt.c
-libvirt.h
-*.pyc
-generated.stamp
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 64e6aec..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.loT
-*.la
-*.exe
-*.cov
-libvirt_parthelper
-libvirt_lxc
-libvirt.def
-libvirt.syms
-libvirt_qemu.def
-*.i
-*.s
-remote_protocol-structs-t
-virt-aa-helper
-libvirt_functions.stp
-libvirt_probes.stp
-probes.o
-probes.h
diff --git a/src/esx/.gitignore b/src/esx/.gitignore
deleted file mode 100644
index 29e1d48..0000000
--- a/src/esx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.generated.*
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 027b421..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,44 +0,0 @@
-*.exe
-.deps
-.libs
-ssh
-commandhelper
-commandhelper.log
-commandhelper.pid
-commandtest
-conftest
-esxutilstest
-eventtest
-interfacexml2xmltest
-networkxml2xmltest
-nodedevxml2xmltest
-nodeinfotest
-object-locking
-object-locking-files.txt
-object-locking.cmi
-object-locking.cmx
-qemuargv2xmltest
-qemuhelptest
-qemuxml2argvtest
-qemuxml2xmltest
-qparamtest
-reconnect
-secaatest
-seclabeltest
-sexpr2xmltest
-sockettest
-statstest
-storagepoolxml2xmltest
-storagevolxml2xmltest
-utiltest
-virbuftest
-virnetmessagetest
-virnetsockettest
-virnettlscontexttest
-virshtest
-virtimetest
-vmx2xmltest
-xencapstest
-xmconfigtest
-xml2sexprtest
-xml2vmxtest
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index 0f7a25e..0000000
--- a/tools/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-libvirt-guests.init
-virt-xml-validate
-virt-pki-validate
-virt-sanlock-cleanup
-*.1
-*.8
-Makefile
-Makefile.in
-virsh-net-edit.c
-virsh-pool-edit.c
-virsh
-*.exe
-.libs
-.deps
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]