diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-13 14:55:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-13 14:55:55 -0400 |
| commit | 8c04e2d27186584e34ea76ff48f4859623654c23 (patch) | |
| tree | b3b9833e00ac212e0ee4083dafc852b38de9e5b5 /Command/Merge.hs | |
| parent | d8f1761b54ef430560d7e8debf10e7310dfd158b (diff) | |
sync: Don't fail if the directory it is run in gets removed by the sync.
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 659f14080..5d6b2ffd2 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -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 |