diff options
| author | Joey Hess <joey@kitenet.net> | 2013-12-17 22:24:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-17 22:24:27 -0400 |
| commit | 19f9c96da384e97a16a9630aa9d210ab4b855403 (patch) | |
| tree | 48209a9c45d6f6c84674cc2bcfdcbad8752c59f1 | |
| parent | b6e9e1f4bd3161d6d4879784c2de2c103aa8f3ae (diff) | |
Fix too broad matching of .gitignored files. Closes: #732339
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | pre-commit.d/30store-metadata | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 381d27e..d2ac94c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +etckeeper (1.11) UNRELEASED; urgency=low + + * Fix too broad matching of .gitignored files. + Closes: #732339 + + -- Joey Hess <joeyh@debian.org> Tue, 17 Dec 2013 22:24:08 -0400 + etckeeper (1.10) unstable; urgency=low * Remove lvm/backup from default ignores, because lvm diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata index fa5b5c6..ec66764 100755 --- a/pre-commit.d/30store-metadata +++ b/pre-commit.d/30store-metadata @@ -29,7 +29,7 @@ filter_ignore() { ;; git) git ls-files --others --ignore --exclude-standard --directory > "$listfile" || true - grep -Fvf "$listfile" + grep -xFvf "$listfile" ;; esac rm -f "$listfile" |