diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-15 14:16:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-15 14:16:48 -0400 |
| commit | bd0c83bf21d6ebd646576e60bedd0444b33468c7 (patch) | |
| tree | e5abcbf96b8180b16f25e166786db2208e9163df /Command/XMPPGit.hs | |
| parent | 3776ebfd3f94a46df0878a9cc506ed0e3ff2cbd2 (diff) | |
| parent | 7644cfac07de00f1d298b01d1a9d62fc9587f295 (diff) | |
Merge branch 'master' into database
Diffstat (limited to 'Command/XMPPGit.hs')
| -rw-r--r-- | Command/XMPPGit.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Command/XMPPGit.hs b/Command/XMPPGit.hs index 47c2d7ff2..2bcb7405e 100644 --- a/Command/XMPPGit.hs +++ b/Command/XMPPGit.hs @@ -1,6 +1,6 @@ {- git-annex command - - - Copyright 2012 Joey Hess <joey@kitenet.net> + - Copyright 2012 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -11,8 +11,8 @@ import Common.Annex import Command import Assistant.XMPP.Git -def :: [Command] -def = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $ +cmd :: [Command] +cmd = [noCommit $ noRepo startNoRepo $ dontCheck repoExists $ command "xmppgit" paramNothing seek SectionPlumbing "git to XMPP relay"] @@ -37,9 +37,9 @@ gitRemoteHelper = do respond [] where expect s = do - cmd <- getLine - unless (cmd == s) $ - error $ "git-remote-helpers protocol error: expected: " ++ s ++ ", but got: " ++ cmd + gitcmd <- getLine + unless (gitcmd == s) $ + error $ "git-remote-helpers protocol error: expected: " ++ s ++ ", but got: " ++ gitcmd respond l = do mapM_ putStrLn l putStrLn "" |