From df0e6302875fba02bdd4fd24a9a0520cdcd7fb1f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sun, 14 Sep 2008 23:57:17 +0200
Subject: commit.d: use git add -A

Till now we were doing this by hand, using git add . and git
ls-files|git rm, but git add -A does the same and it's faster.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 commit.d/30git-add |  4 ++--
 commit.d/40git-rm  | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100755 commit.d/40git-rm

diff --git a/commit.d/30git-add b/commit.d/30git-add
index 66d96a9..b08b583 100755
--- a/commit.d/30git-add
+++ b/commit.d/30git-add
@@ -2,7 +2,7 @@
 set -e
 
 if [ "$VCS" = git ] && [ -d .git ]; then
-	if ! git add .; then
-		echo "etckeeper warning: git add failed" >&2
+	if ! git add --all; then
+		echo "etckeeper warning: git add --all" >&2
 	fi
 fi
diff --git a/commit.d/40git-rm b/commit.d/40git-rm
deleted file mode 100755
index d2c51c2..0000000
--- a/commit.d/40git-rm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-IFS='
-'
-
-if [ "$VCS" = git ] && [ -d .git ]; then
-	for file in $(git ls-files --deleted); do
-		if [ ! -d "$file" ]; then 
-			git rm --quiet "$file"
-		fi
-	done
-fi
-- 
cgit v1.2.3


From 3890ca9dfef73136838dded5889fa2f9d85d1dd9 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sun, 14 Sep 2008 23:57:18 +0200
Subject: Update debian/control

Update dependency for git (git add -A is not available in older
versions).

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d0d12c4..7a956ee 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://kitenet.net/~joey/code/etckeeper/
 Package: etckeeper
 Architecture: all
 Section: admin
-Depends: git-core (>= 1:1.5.4) | mercurial | bzr (>= 1.4~), ${misc:Depends}
+Depends: git-core (>= 1:1.6.0) | mercurial | bzr (>= 1.4~), ${misc:Depends}
 Conflicts: bzr (<< 1.4~)
 Description: store /etc in git, mercurial, or bzr
  The etckeeper program is a tool to let /etc be stored in a git, mercurial,
-- 
cgit v1.2.3


From f8ccc8f93ecaacb7db2633319d15cc5441fa7bad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 14 Sep 2008 18:46:25 -0400
Subject: Use new git add -A from git 1.6.0 (Miklos Vajna)

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4de1889..b1521a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (0.22) UNRELEASED; urgency=low
+
+  * Use new git add -A from git 1.6.0 (Miklos Vajna)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 14 Sep 2008 18:46:08 -0400
+
 etckeeper (0.21) unstable; urgency=low
 
   * Swedish debconf translation from Martin Ågren. Closes: #492063
-- 
cgit v1.2.3