summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-13 15:05:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-13 15:06:49 -0400
commit13fff71f2019ae098c3f8532ac2734cb1ab11498 (patch)
treef37714c4089df4afac9bf9724c80757e5fd29e6f /Command/Sync.hs
parent46588674b081cd4ea5820680d8fc15c81ed175ad (diff)
split out three modules from Git
Constructors and configuration make sense in separate modules. A separate Git.Types is needed to avoid cycles.
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 7dc5f4d24..987eb6138 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -11,6 +11,7 @@ import Common.Annex
import Command
import qualified Annex.Branch
import qualified Git
+import qualified Git.Config
import qualified Data.ByteString.Lazy.Char8 as L
@@ -56,7 +57,7 @@ push = do
defaultRemote :: Annex String
defaultRemote = do
branch <- currentBranch
- fromRepo $ Git.configGet ("branch." ++ branch ++ ".remote") "origin"
+ fromRepo $ Git.Config.get ("branch." ++ branch ++ ".remote") "origin"
currentBranch :: Annex String
currentBranch = last . split "/" . L.unpack . head . L.lines <$>
@@ -65,6 +66,6 @@ currentBranch = last . split "/" . L.unpack . head . L.lines <$>
checkRemote :: String -> Annex ()
checkRemote remote = do
remoteurl <- fromRepo $
- Git.configGet ("remote." ++ remote ++ ".url") ""
+ Git.Config.get ("remote." ++ remote ++ ".url") ""
when (null remoteurl) $ do
error $ "No url is configured for the remote: " ++ remote