diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-30 16:03:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-30 16:03:41 -0400 |
| commit | 5728bb58e0c48b892998715ffb6061a1d0c8a354 (patch) | |
| tree | 6918d3e044aa1164ece8468a55e00caf40336cb8 /Command/Sync.hs | |
| parent | 925b6390aa27f6b22935c6e2b214adf35889f0b0 (diff) | |
force git-annex branch update after fetching remotes
git-annex normally only runs the branch update once per run, for speed, but
since this fetches new remote git-annex tracking branches, they need to be
merged in after that fetch. An earlier call to Remote.byName was causing
the update to run before the fetch sometimes, but it could have been
anything. Just force the update to happen in the right place.
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index cc8818889..c3d5a2636 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -16,7 +16,6 @@ import qualified Git.Command import qualified Git.Config import qualified Git.Ref import qualified Git -import qualified Command.Merge import qualified Data.ByteString.Lazy.Char8 as L @@ -39,7 +38,7 @@ seek args = do ] ++ [ fetch remote | remote <- remotes ] ++ [ mergeRemote remote branch | remote <- remotes ] ++ - [ Command.Merge.start ] ++ + [ mergeAnnex ] ++ [ pushLocal branch ] ++ [ pushRemote remote branch | remote <- remotes ] @@ -130,3 +129,8 @@ checkRemote remote = do Git.Config.get ("remote." ++ Remote.name remote ++ ".url") "" when (null remoteurl) $ error $ "No url is configured for the remote: " ++ Remote.name remote + +mergeAnnex :: CommandStart +mergeAnnex = next $ next $ do + Annex.Branch.forceUpdate + return True |