diff options
Diffstat (limited to 'Assistant/Threads/Merger.hs')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index c79566349..6e19218d9 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -89,7 +89,7 @@ mergeBranch = Git.Merge.mergeNonInteractive . Command.Sync.syncBranch - when a push fails, which can happen due to a remote not having pushed - changes to us. That could be because it doesn't have us as a remote, or - because the assistant is not running there, or other reasons. -} -manualPull :: Git.Ref -> [Remote] -> Annex () +manualPull :: (Maybe Git.Ref) -> [Remote] -> Annex () manualPull currentbranch remotes = do forM_ remotes $ \r -> inRepo $ Git.Command.runBool "fetch" [Param $ Remote.name r] |