diff options
| author | Joey Hess <joey@kitenet.net> | 2013-09-04 21:45:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-04 21:45:22 -0400 |
| commit | 128a0838f6a7c70a013f020d2284de46c04ebcfc (patch) | |
| tree | 009c8287cce0a2d150c33c664717b690bf9ce2d7 | |
| parent | e98fb4c5cf3f756e1f2f5a25b88900ba16e80dfa (diff) | |
Fix git update-ignore syntax. Closes: #721873
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | pre-commit.d/30store-metadata | 2 |
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 |