diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-11-03 16:05:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-03 16:05:03 -0400 |
| commit | 1780931b0443302ddbe177ffb3037da88e1c2704 (patch) | |
| tree | 20a9f34d030c65802a6113ab2c6b5ed6162015e6 /Remote | |
| parent | b69362e972190668a0742059f0798d2ce00f15c6 (diff) | |
| parent | fe5f014c409a044218b469f99149e69efa6d2a2e (diff) | |
Merge branch 'master' into s3-aws-multipart
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/GCrypt.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs index 995c3e838..9aa70d57e 100644 --- a/Remote/GCrypt.hs +++ b/Remote/GCrypt.hs @@ -202,7 +202,7 @@ gCryptSetup mu _ c = go $ M.lookup "gitrepo" c method <- setupRepo gcryptid =<< inRepo (Git.Construct.fromRemoteLocation gitrepo) gitConfigSpecialRemote u c' "gcrypt" (fromAccessMethod method) return (c', u) - else error $ "uuid mismatch " ++ show (u, mu, gcryptid) + else error $ "uuid mismatch; expected " ++ show mu ++ " but remote gitrepo has " ++ show u ++ " (" ++ show gcryptid ++ ")" {- Sets up the gcrypt repository. The repository is either a local - repo, or it is accessed via rsync directly, or it is accessed over ssh |