From 927fb6ca6298a15e8f4199618d7f3997573c7d0a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Feb 2016 16:57:42 -0400 Subject: update sync branch to the orig branch when in adjusted branch --- Assistant/XMPP/Git.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Assistant/XMPP/Git.hs') diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs index 286fcf879..612e0f2c5 100644 --- a/Assistant/XMPP/Git.hs +++ b/Assistant/XMPP/Git.hs @@ -299,7 +299,7 @@ runPush checkcloudrepos (Pushing cid (PushRequest theiruuid)) = (g, u) <- liftAnnex $ (,) <$> gitRepo <*> getUUID - liftIO $ Command.Sync.updateBranch (Command.Sync.syncBranch branch) g + liftIO $ Command.Sync.updateBranch (Command.Sync.syncBranch branch) branch g selfjid <- ((T.unpack <$>) . xmppClientID) <$> getDaemonStatus if null rs then return Nothing -- cgit v1.2.3