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.
This commit is contained in:
parent
c0fbd3017f
commit
c4e6730042
3 changed files with 13 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue