diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-30 19:12:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-30 19:12:05 -0400 |
| commit | fdfcf16d8d2d2475bcf9cabed3f5cd2e7a2ac4a5 (patch) | |
| tree | 3a8b42f3ab3082f9a3e6010491ee5f44d250f24c | |
| parent | f3888b0fb68e48f8dc5b0e73caf0af6fc9fb34b7 (diff) | |
webapp: Make an initial, empty commit so there is a master branch
Several things only happen when on a branch, so make sure we're on one.
| -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 |