diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-04-07 13:59:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-07 13:59:31 -0400 |
| commit | bc51387e6dd426f46f9ab0ef23e6e3eefe7a4417 (patch) | |
| tree | 9627f60c81d1852b731ea57171f4b36887847e9b /Remote | |
| parent | 77f45e4e45d45a08bfe1bec210909345adb6f6d8 (diff) | |
Periodically flush git command queue, to avoid boating memory usage too much.
Since the queue is flushed in between subcommand actions being run,
there should be no issues with actions that expect to queue up some stuff
and have it run after they do other stuff. So I didn't have to audit for
such assumptions.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index a45845510..2936beaf7 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -19,6 +19,7 @@ import RemoteClass import Types import qualified GitRepo as Git import qualified Annex +import qualified AnnexQueue import Locations import UUID import Utility @@ -150,7 +151,7 @@ copyToRemote r key Annex.eval a $ do ok <- Content.getViaTmp key $ \f -> liftIO $ copyFile keysrc f - Annex.queueRun + AnnexQueue.flush True return ok | Git.repoIsSsh r = do g <- Annex.gitRepo |