aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--RemoteDaemon/Core.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4493c8035..2b15293fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,8 @@ git-annex (6.20160528) UNRELEASED; urgency=medium
when used with git 2.9, which has stopped doing this itself.
* Automatically enable v6 mode when initializing in a clone from a repo
that has an adjusted branch checked out.
+ * remotedaemon: Fixed support for notifications of changes to gcrypt
+ remotes, which was never tested and didn't quite work before.
-- Joey Hess <id@joeyh.name> Fri, 27 May 2016 13:12:48 -0400
diff --git a/RemoteDaemon/Core.hs b/RemoteDaemon/Core.hs
index a861ec29b..e74da889b 100644
--- a/RemoteDaemon/Core.hs
+++ b/RemoteDaemon/Core.hs
@@ -126,7 +126,7 @@ genRemoteMap h@(TransportHandle g _) ochan =
_ -> return Nothing
_ -> return Nothing
where
- gc = extractRemoteGitConfig r (Git.repoDescribe r)
+ gc = extractRemoteGitConfig g (Git.repoDescribe r)
genTransportHandle :: IO TransportHandle
genTransportHandle = do