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 /Remote | |
| 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 'Remote')
| -rw-r--r-- | Remote/Git.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 5b9d5d3df..c8290c9a7 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -17,7 +17,6 @@ import Types import Types.Remote import qualified GitRepo as Git import qualified Annex -import qualified AnnexQueue import Locations import UUID import Utility @@ -147,7 +146,7 @@ copyToRemote r key Annex.eval a $ do ok <- Content.getViaTmp key $ rsyncOrCopyFile r keysrc - AnnexQueue.flush True + Content.saveState return ok | Git.repoIsSsh r = do g <- Annex.gitRepo |