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/Pusher.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/Pusher.hs')
| -rw-r--r-- | Assistant/Threads/Pusher.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/Pusher.hs b/Assistant/Threads/Pusher.hs index 5e110b77d..4753e355a 100644 --- a/Assistant/Threads/Pusher.hs +++ b/Assistant/Threads/Pusher.hs @@ -118,5 +118,5 @@ pushToRemotes threadname now st mpushmap remotes = do retry branch g rs = do debug threadname [ "trying manual pull to resolve failed pushes" ] - runThreadState st $ manualPull branch rs + runThreadState st $ manualPull (Just branch) rs go False (Just branch) g rs |