summaryrefslogtreecommitdiff
path: root/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-22 18:32:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-22 18:32:41 -0400
commit80302d0b46c5d45df1cf290796e0e27d9264ece8 (patch)
treec97312a531f5cf2ef514ddb5224395b614eb2b25 /Content.hs
parent944c51ba26efc39416c5f148b6ec36151dc7f42e (diff)
improve bare repo handing
Many more commands can work in bare repos now, thanks to the git-annex branch.
Diffstat (limited to 'Content.hs')
-rw-r--r--Content.hs14
1 files changed, 3 insertions, 11 deletions
diff --git a/Content.hs b/Content.hs
index 5d77cc979..45653fc9e 100644
--- a/Content.hs
+++ b/Content.hs
@@ -9,7 +9,6 @@ module Content (
inAnnex,
calcGitLink,
logStatus,
- logStatusFor,
getViaTmp,
getViaTmpUnchecked,
withTmp,
@@ -27,7 +26,7 @@ import System.IO.Error (try)
import System.Directory
import Control.Monad.State (liftIO)
import System.Path
-import Control.Monad (when, unless, filterM)
+import Control.Monad (when, filterM)
import System.Posix.Files
import System.FilePath
import Data.Maybe
@@ -71,16 +70,9 @@ calcGitLink file key = do
- updated instead. -}
logStatus :: Key -> LogStatus -> Annex ()
logStatus key status = do
- u <- getUUID =<< Annex.gitRepo
- logStatusFor u key status
-
-{- Updates the LocationLog when a key's presence changes in a repository
- - identified by UUID. -}
-logStatusFor :: UUID -> Key -> LogStatus -> Annex ()
-logStatusFor u key status = do
g <- Annex.gitRepo
- unless (Git.repoIsLocalBare g) $ do
- logChange g key u status
+ u <- getUUID g
+ logChange g key u status
{- Runs an action, passing it a temporary filename to download,
- and if the action succeeds, moves the temp file into