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

remove unnecessary check

Browse source 
mergeLocal always creates the local sync branch, so no need to check that
it exists later.
This commit is contained in:
Joey Hess 2011-12-31 03:08:41 -04:00
parent aa64b8ceaf
commit c61642ef0c
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Command/Sync.hs
View file

@ -92,13 +92,9 @@ mergeLocal branch = go =<< needmerge
next $ next $ mergeFrom syncbranch next $ next $ mergeFrom syncbranch
pushLocal :: Git.Ref -> CommandStart pushLocal :: Git.Ref -> CommandStart
pushLocal branch = go =<< inRepo (Git.Ref.exists syncbranch) pushLocal branch = do
where updateBranch $ syncBranch branch
syncbranch = syncBranch branch stop
go False = stop
go True = do
updateBranch syncbranch
stop
updateBranch :: Git.Ref -> Annex () updateBranch :: Git.Ref -> Annex ()
updateBranch syncbranch = updateBranch syncbranch =