summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Backend.hs6
-rw-r--r--debian/changelog2
2 files changed, 6 insertions, 2 deletions
diff --git a/Backend.hs b/Backend.hs
index 693e1371b..e1d0e0a68 100644
--- a/Backend.hs
+++ b/Backend.hs
@@ -146,5 +146,7 @@ lookupFile file = do
-}
chooseBackends :: [FilePath] -> Annex [(FilePath, Maybe Backend)]
chooseBackends fs = do
- -- TODO
- return $ map (\f -> (f, Nothing)) fs
+ g <- Annex.gitRepo
+ bs <- Annex.supportedBackends
+ pairs <- liftIO $ Git.checkAttr g "git-annex-backend" fs
+ return $ map (\(f,b) -> (f, maybeLookupBackendName bs b)) pairs
diff --git a/debian/changelog b/debian/changelog
index 1709f6346..b433ec62f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ git-annex (0.03) UNRELEASED; urgency=low
* Added remote.annex-scp-options and remote.annex-ssh-options.
* The backends to use when adding different sets of files can be configured
via gitattributes.
+ * In .gitattributes, the git-annex-backend attribute can be set to the
+ names of backends to use when adding different types of files.
-- Joey Hess <joeyh@debian.org> Thu, 28 Oct 2010 13:46:59 -0400