summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-15 15:44:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-15 15:44:32 -0400
commitd036cd590f5c3c4edcd025effcf57c3d16886559 (patch)
tree4fada9155bcded2d07fce89b64284fb7a5317c1b
parentaedf84f7d638eb222811c13da1c642268ca06600 (diff)
bugfix: drop and fsck did not honor --exclude
-rw-r--r--Command.hs3
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 1 deletions
diff --git a/Command.hs b/Command.hs
index c1069f0d9..bcc05c03c 100644
--- a/Command.hs
+++ b/Command.hs
@@ -133,7 +133,8 @@ withAttrFilesInGit :: String -> CommandSeekAttrFiles
withAttrFilesInGit attr a params = do
repo <- Annex.gitRepo
files <- liftIO $ runPreserveOrder (LsFiles.inRepo repo) params
- liftM (map a) $ liftIO $ Git.checkAttr repo attr files
+ files' <- filterFiles files
+ liftM (map a) $ liftIO $ Git.checkAttr repo attr files'
withNumCopies :: CommandSeekAttrFiles
withNumCopies = withAttrFilesInGit "annex.numcopies"
withBackendFilesInGit :: CommandSeekBackendFiles
diff --git a/debian/changelog b/debian/changelog
index d9e606f82..e940989da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ git-annex (3.20110907) UNRELEASED; urgency=low
only its file component.
* get, drop, copy: Added --auto option, which decides whether
to get/drop content as needed to work toward the configured numcopies.
+ * bugfix: drop and fsck did not honor --exclude
-- Joey Hess <joeyh@debian.org> Tue, 06 Sep 2011 16:59:15 -0400