diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-29 16:57:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 16:57:42 -0400 |
| commit | 927fb6ca6298a15e8f4199618d7f3997573c7d0a (patch) | |
| tree | 4dd37d8b2b67ff18a7b02716fcf901d056e3f751 /Assistant | |
| parent | 6d4ab4dc7389e2184d32962b751268125dfa56ae (diff) | |
update sync branch to the orig branch when in adjusted branch
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/XMPP/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |