diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 21:19:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 21:21:09 -0400 |
| commit | c4e6730042e64e3b2f92626aee4a6b38a8f9c70c (patch) | |
| tree | 569c5539530a40e24890eb267f0f54ddf24c2282 /CmdLine.hs | |
| parent | c0fbd3017f215cd61d79d24e110ce177e4823089 (diff) | |
commit git-annex branch when copying to a remote (locally)
Otherwise, the location log changes are only staged in its index,
and this can confuse matters if pulling or cloning from the remote.
The test suite was failing because this wasn't done.
Diffstat (limited to 'CmdLine.hs')
| -rw-r--r-- | CmdLine.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/CmdLine.hs b/CmdLine.hs index d10516bb9..ab7236847 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -19,7 +19,7 @@ import Control.Monad (when) import qualified Annex import qualified AnnexQueue import qualified GitRepo as Git -import qualified Branch +import Content import Types import Command import BackendList @@ -103,9 +103,6 @@ startup = do {- Cleanup actions. -} shutdown :: Annex Bool shutdown = do - AnnexQueue.flush False - Branch.commit "update" - + saveState liftIO $ Git.reap - return True |