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.
This commit is contained in:
parent
a3f76fe696
commit
5ae1f75a39
5 changed files with 43 additions and 24 deletions
|
@ -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]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue