fix crashes when run in a git repo that has been initted but has no master branch yet
This commit is contained in:
parent
7478872a09
commit
34fc0d358e
4 changed files with 36 additions and 27 deletions
|
@ -22,8 +22,8 @@ import Utility.ThreadScheduler
|
|||
import Utility.Mounts
|
||||
import Remote.List
|
||||
import qualified Types.Remote as Remote
|
||||
import qualified Command.Sync
|
||||
import Assistant.Threads.Merger
|
||||
import qualified Git.Branch
|
||||
|
||||
import Control.Concurrent
|
||||
import qualified Control.Exception as E
|
||||
|
@ -161,15 +161,18 @@ handleMount st dstatus scanremotes dir = do
|
|||
debug thisThread ["detected mount of", dir]
|
||||
rs <- remotesUnder st dstatus dir
|
||||
unless (null rs) $ do
|
||||
branch <- runThreadState st $ Command.Sync.currentBranch
|
||||
let nonspecial = filter (Git.repoIsLocal . Remote.repo) rs
|
||||
unless (null nonspecial) $
|
||||
void $ alertWhile dstatus (syncMountAlert dir nonspecial) $ do
|
||||
debug thisThread ["syncing with", show nonspecial]
|
||||
runThreadState st $ manualPull branch nonspecial
|
||||
now <- getCurrentTime
|
||||
pushToRemotes thisThread now st Nothing nonspecial
|
||||
addScanRemotes scanremotes rs
|
||||
go rs =<< runThreadState st (inRepo Git.Branch.current)
|
||||
where
|
||||
go _ Nothing = noop
|
||||
go rs (Just branch) = do
|
||||
let nonspecial = filter (Git.repoIsLocal . Remote.repo) rs
|
||||
unless (null nonspecial) $
|
||||
void $ alertWhile dstatus (syncMountAlert dir nonspecial) $ do
|
||||
debug thisThread ["syncing with", show nonspecial]
|
||||
runThreadState st $ manualPull branch nonspecial
|
||||
now <- getCurrentTime
|
||||
pushToRemotes thisThread now st Nothing nonspecial
|
||||
addScanRemotes scanremotes rs
|
||||
|
||||
{- Finds remotes located underneath the mount point.
|
||||
-
|
||||
|
|
|
@ -17,6 +17,7 @@ import Assistant.DaemonStatus
|
|||
import qualified Command.Sync
|
||||
import Utility.ThreadScheduler
|
||||
import Utility.Parallel
|
||||
import qualified Git.Branch
|
||||
|
||||
import Data.Time.Clock
|
||||
import qualified Data.Map as M
|
||||
|
@ -84,10 +85,11 @@ shouldPush _now commits
|
|||
pushToRemotes :: ThreadName -> UTCTime -> ThreadState -> (Maybe FailedPushMap) -> [Remote] -> IO Bool
|
||||
pushToRemotes threadname now st mpushmap remotes = do
|
||||
(g, branch) <- runThreadState st $
|
||||
(,) <$> fromRepo id <*> Command.Sync.currentBranch
|
||||
(,) <$> fromRepo id <*> inRepo Git.Branch.current
|
||||
go True branch g remotes
|
||||
where
|
||||
go shouldretry branch g rs = do
|
||||
go _ Nothing _ _ = return True -- no branch, so nothing to do
|
||||
go shouldretry (Just branch) g rs = do
|
||||
debug threadname
|
||||
[ "pushing to"
|
||||
, show rs
|
||||
|
@ -117,4 +119,4 @@ 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
|
||||
go False branch g rs
|
||||
go False (Just branch) g rs
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue