mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

push original branch when on adjusted branch

Browse source
This commit is contained in:
Joey Hess 2016-02-29 15:29:56 -04:00
parent 7c20bf6e7a
commit c1d7a5b97c
Failed to extract signature
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assistant/XMPP/Git.hs
View file

@ -292,10 +292,9 @@ xmppRemotes cid theiruuid = case baseJID <$> parseJID cid of
{- Returns the ClientID that it pushed to. -} {- Returns the ClientID that it pushed to. -}
runPush :: (Remote -> Assistant ()) -> NetMessage -> Assistant (Maybe ClientID) runPush :: (Remote -> Assistant ()) -> NetMessage -> Assistant (Maybe ClientID)
runPush checkcloudrepos (Pushing cid (PushRequest theiruuid)) = runPush checkcloudrepos (Pushing cid (PushRequest theiruuid)) =
go =<< liftAnnex (inRepo Git.Branch.current) go =<< liftAnnex (join Command.Sync.getCurrBranch)
where where
go Nothing = return Nothing go (Just branch, _) = do
go (Just branch) = do
rs <- xmppRemotes cid theiruuid rs <- xmppRemotes cid theiruuid
liftAnnex $ Annex.Branch.commit "update" liftAnnex $ Annex.Branch.commit "update"
(g, u) <- liftAnnex $ (,) (g, u) <- liftAnnex $ (,)
@ -311,6 +310,7 @@ runPush checkcloudrepos (Pushing cid (PushRequest theiruuid)) =
xmppPush cid (taggedPush u selfjid branch r) xmppPush cid (taggedPush u selfjid branch r)
checkcloudrepos r checkcloudrepos r
return $ Just cid return $ Just cid
go _ = return Nothing
runPush checkcloudrepos (Pushing cid (StartingPush theiruuid)) = do runPush checkcloudrepos (Pushing cid (StartingPush theiruuid)) = do
rs <- xmppRemotes cid theiruuid rs <- xmppRemotes cid theiruuid
if null rs if null rs