diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-05 16:35:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-05 16:35:30 -0400 |
| commit | 5ae1f75a39ffd26b23c8199998f502df78b9b75a (patch) | |
| tree | 5ba650b428cd90b98a0380bed37df59efd3294a9 /Assistant/Threads/Merger.hs | |
| parent | a3f76fe696c603078621ccca6d7b17270cc7ef11 (diff) | |
handle case of adding populated drive to just created repo
The just created repo has no master branch commits yet. This is now
handled, merging in the master branch from the populated drive.
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] |