From 20a8350e36f6e38b55603e6578fa7b1c4967c1a9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 28 Jan 2015 17:17:26 -0400 Subject: implement annex.tune.branchhash1 I hope this doesn't impact speed much -- it does have to pull out a value from Annex state every time it accesses the branch now. The test case I dropped has never caught any problems that I can remember, and would have been rather difficult to convert. --- Upgrade/V2.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Upgrade') diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 2b0b277e8..0f09205ff 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -12,6 +12,7 @@ import qualified Git import qualified Git.Command import qualified Git.Ref import qualified Annex.Branch +import qualified Annex import Annex.Content import Utility.Tmp import Logs @@ -47,7 +48,8 @@ upgrade = do e <- liftIO $ doesDirectoryExist old when e $ do - mapM_ (\(k, f) -> inject f $ locationLogFile k) =<< locationLogs + config <- Annex.getGitConfig + mapM_ (\(k, f) -> inject f $ locationLogFile config k) =<< locationLogs mapM_ (\f -> inject f f) =<< logFiles old saveState False -- cgit v1.2.3