diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-01-28 15:41:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-01-28 15:41:52 -0400 |
| commit | b81d662cbf0036d0e2b632ed95a877feab2a4860 (patch) | |
| tree | 210d8138f9cde552ebe450fbbdc2a6d6508086b2 /Command | |
| parent | 303666965ab5bc891c8ed44969553afb642c3f9c (diff) | |
Avoid repeated location log commits when a remote is receiving files.
Done by adding a oneshot mode, in which location log changes are written to
the journal, but not committed. Taking advantage of git-annex's existing
ability to recover in this situation.
This is used by git-annex-shell and other places where changes are made to
a remote's location log.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/RecvKey.hs | 4 | ||||
| -rw-r--r-- | Command/Uninit.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs index 5243fa9d4..a27a5efdf 100644 --- a/Command/RecvKey.hs +++ b/Command/RecvKey.hs @@ -28,7 +28,7 @@ start key = do if ok then do -- forcibly quit after receiving one key, - -- and shutdown cleanly so queued git commands run - _ <- shutdown + -- and shutdown cleanly + _ <- shutdown True liftIO exitSuccess else liftIO exitFailure diff --git a/Command/Uninit.hs b/Command/Uninit.hs index cef89a5cf..ec6d0abf3 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -57,7 +57,7 @@ cleanup = do mapM_ removeAnnex =<< getKeysPresent liftIO $ removeDirectoryRecursive annexdir -- avoid normal shutdown - saveState + saveState False inRepo $ Git.Command.run "branch" [Param "-D", Param $ show Annex.Branch.name] liftIO exitSuccess |