mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

check that synced/master exists before trying to use it

Browse source 
and a nice error message if syncing is not set up yet
This commit is contained in:
Joey Hess 2011-12-30 18:19:45 -04:00
parent f2fa29bf3b
commit 56488e807b
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command/Sync.hs
View file

@ -70,9 +70,13 @@ commit = do
return True return True
mergeLocal :: Git.Ref -> CommandStart mergeLocal :: Git.Ref -> CommandStart
mergeLocal branch = go =<< inRepo (Git.Branch.changed branch mergebranch) mergeLocal branch = go =<< needmerge
where where
mergebranch = Git.Ref.under "refs/heads/synced" branch mergebranch = Git.Ref.under "refs/heads/synced" branch
needmerge = do
unlessM (inRepo $ Git.Ref.exists mergebranch) $
error $ Git.Ref.describe mergebranch ++ " does not exist; create it to enable sync"
inRepo $ Git.Branch.changed branch mergebranch
go False = stop go False = stop
go True = do go True = do
showStart "merge" $ Git.Ref.describe mergebranch showStart "merge" $ Git.Ref.describe mergebranch
@ -109,7 +113,8 @@ pullRemote remote branch = do
next $ do next $ do
checkRemote remote checkRemote remote
showOutput showOutput
fetched <- inRepo $ Git.Command.runBool "fetch" [Param (Remote.name remote)] fetched <- inRepo $ Git.Command.runBool "fetch"
[Param $ Remote.name remote]
if fetched if fetched
then next $ mergeRemote remote branch then next $ mergeRemote remote branch
else stop else stop