diff options
| -rw-r--r-- | Assistant/Sync.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index b071bc80f..1e94335ef 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -155,5 +155,6 @@ manualPull currentbranch remotes = do syncNewRemote :: Remote -> Assistant () syncNewRemote remote = do updateSyncRemotes - thread <- asIO2 reconnectRemotes - void $ liftIO $ forkIO $ thread False [remote] + thread <- asIO $ do + reconnectRemotes False [remote] + void $ liftIO $ forkIO $ thread diff --git a/debian/changelog b/debian/changelog index 34d819949..36a7253a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ git-annex (3.20121018) UNRELEASED; urgency=low to test a key's presence. * The standalone tarball's runshell now takes care of installing a ~/.ssh/git-annex-shell wrapper the first time it's run. + * webapp: Make an initial, empty commit so there is a master branch -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 |