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

sync: Don't fail if the directory it is run in gets removed by the sync.

Browse source
This commit is contained in:
Joey Hess 2013-09-13 14:55:55 -04:00
parent 928016c670
commit 2407170eaf
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Merge.hs
View file

@ -11,7 +11,7 @@ import Common.Annex
import Command
import qualified Annex.Branch
import qualified Git.Branch
import Command.Sync (mergeLocal)
import Command.Sync (prepMerge, mergeLocal)
def :: [Command]
def = [command "merge" paramNothing seek SectionMaintenance
@ -35,4 +35,5 @@ mergeBranch = do
mergeSynced :: CommandStart
mergeSynced = do
branch <- inRepo Git.Branch.current
prepMerge
maybe stop mergeLocal branch