diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 16535070ee..e6deee4bf4 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -56,7 +56,7 @@ gen r u c gc = do whereisKey = Nothing, remoteFsck = Nothing, repairRepo = Nothing, - config = M.empty, + config = c, repo = r, gitconfig = gc, localpath = Just dir, diff --git a/Remote/Git.hs b/Remote/Git.hs index ba247078b4..d4e5987dc5 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -120,7 +120,7 @@ gen r u c gc , repairRepo = if Git.repoIsUrl r then Nothing else Just $ repairRemote r - , config = M.empty + , config = c , localpath = localpathCalc r , repo = r , gitconfig = gc diff --git a/Remote/Hook.hs b/Remote/Hook.hs index fdb24d0cb3..55ff785141 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -54,7 +54,7 @@ gen r u c gc = do whereisKey = Nothing, remoteFsck = Nothing, repairRepo = Nothing, - config = M.empty, + config = c, localpath = Nothing, repo = r, gitconfig = gc, diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 6bc5fd78f8..91638de98b 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -81,7 +81,7 @@ gen r u c gc = do , whereisKey = Nothing , remoteFsck = Nothing , repairRepo = Nothing - , config = M.empty + , config = c , repo = r , gitconfig = gc , localpath = if islocal diff --git a/Remote/Web.hs b/Remote/Web.hs index 7c98dbf40a..9af80a7763 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -58,7 +58,7 @@ gen r _ _ gc = whereisKey = Just getUrls, remoteFsck = Nothing, repairRepo = Nothing, - config = M.empty, + config = c, gitconfig = gc, localpath = Nothing, repo = r, diff --git a/debian/changelog b/debian/changelog index 3f37a4d371..927b2e00bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git-annex (4.20131102) UNRELEASED; urgency=low the pairing process separately. * sync: Work even when the local git repository is new and empty, with no master branch. + * gcrypt, bup: Fix bug that prevented using these special remotes + with encryption=pubkey. -- Joey Hess Sat, 02 Nov 2013 14:54:36 -0400