summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xpre-commit.d/30store-metadata2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 90d8acd..c482cf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (1.9) unstable; urgency=low
+
+ * Fix git update-ignore syntax. Closes: #721873
+
+ -- Joey Hess <joeyh@debian.org> Wed, 04 Sep 2013 21:43:42 -0400
+
etckeeper (1.8) unstable; urgency=low
* Avoid listing .gitignored files in .etckeeper file. Closes: #607665
diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata
index 3bb52e5..fa5b5c6 100755
--- a/pre-commit.d/30store-metadata
+++ b/pre-commit.d/30store-metadata
@@ -28,7 +28,7 @@ filter_ignore() {
grep -Evf "$listfile"
;;
git)
- git ls-files --others --ignore --directory > "$listfile" || true
+ git ls-files --others --ignore --exclude-standard --directory > "$listfile" || true
grep -Fvf "$listfile"
;;
esac