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

update sync branch to the orig branch when in adjusted branch

Browse source
This commit is contained in:
Joey Hess 2016-02-29 16:57:42 -04:00
parent 048d513233
commit 9731514c75
Failed to extract signature
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/XMPP/Git.hs
View file

@ -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