From 5a3f41a50d1fd94a18fcced49722f3087e36aec6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Oct 2014 14:20:10 -0400 Subject: doh't use "def" for command definitions, it conflicts with Data.Default.def --- Command/XMPPGit.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Command/XMPPGit.hs') diff --git a/Command/XMPPGit.hs b/Command/XMPPGit.hs index 47c2d7ff2..ab238c85e 100644 --- a/Command/XMPPGit.hs +++ b/Command/XMPPGit.hs @@ -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 "" -- cgit v1.2.3