diff options
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 3 | ||||
| -rw-r--r-- | Assistant/Threads/SanityChecker.hs | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 99d01b580..75976ee3c 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -82,7 +82,8 @@ commitStaged = do Right _ -> do direct <- isDirect let params = nomessage $ catMaybes - [ Just $ Param "commit" + [ Just $ Param "-c", Just $ Param "gc.auto=0" + , Just $ Param "commit" , Just $ Param "--quiet" {- In indirect mode, avoid running the - usual git-annex pre-commit hook; diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs index 0a1b15699..806441058 100644 --- a/Assistant/Threads/SanityChecker.hs +++ b/Assistant/Threads/SanityChecker.hs @@ -14,6 +14,7 @@ import Assistant.Common import Assistant.DaemonStatus import Assistant.Alert import qualified Git.LsFiles +import qualified Git.Command import Utility.ThreadScheduler import qualified Assistant.Threads.Watcher as Watcher import Utility.LogFile @@ -71,6 +72,7 @@ waitForNextCheck = do dailyCheck :: Assistant Bool dailyCheck = do g <- liftAnnex gitRepo + -- Find old unstaged symlinks, and add them to git. (unstaged, cleanup) <- liftIO $ Git.LsFiles.notInRepo False ["."] g now <- liftIO $ getPOSIXTime @@ -81,6 +83,11 @@ dailyCheck = do | isSymbolicLink s -> addsymlink file ms _ -> noop liftIO $ void cleanup + + {- Allow git-gc to run once per day. More frequent gc is avoided + - to avoid slowing things down. -} + void $ liftIO $ Git.Command.runBool [Param "gc", Param "--auto"] g + return True where toonew timestamp now = now < (realToFrac (timestamp + slop) :: POSIXTime) |