summaryrefslogtreecommitdiff
path: root/Remote/Git.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Remote/Git.hs')
-rw-r--r--Remote/Git.hs17
1 files changed, 7 insertions, 10 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 0528f9f88..403c91b4f 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -247,7 +247,7 @@ tryGitConfigRead autoinit r
-- Cache when http remote is not bare for
-- optimisation.
unless (Git.Config.isBare r') $
- setremote "annex-bare" (Git.Config.boolConfig False)
+ setremote setRemoteBare False
return r'
store = observe $ \r' -> do
@@ -274,21 +274,18 @@ tryGitConfigRead autoinit r
return r
set_ignore msg longmessage = do
- let k = "annex-ignore"
case Git.remoteName r of
Nothing -> noop
Just n -> do
- warning $ "Remote " ++ n ++ " " ++ msg ++ "; setting " ++ k
+ warning $ "Remote " ++ n ++ " " ++ msg ++ "; setting annex-ignore"
when longmessage $
- warning $ "This could be a problem with the git-annex installation on the remote. Please make sure that git-annex-shell is available in PATH when you ssh into the remote. Once you have fixed the git-annex installation, run: git config remote." ++ n ++ "." ++ k ++ " false"
- setremote k (Git.Config.boolConfig True)
+ warning $ "This could be a problem with the git-annex installation on the remote. Please make sure that git-annex-shell is available in PATH when you ssh into the remote. Once you have fixed the git-annex installation, run: git annex enableremote " ++ n
+ setremote setRemoteIgnore True
- setremote k v = case Git.remoteName r of
+ setremote setter v = case Git.remoteName r of
Nothing -> noop
- Just n -> do
- let k' = "remote." ++ n ++ "." ++ k
- inRepo $ Git.Command.run [Param "config", Param k', Param v]
-
+ Just n -> setter r v
+
handlegcrypt Nothing = return r
handlegcrypt (Just _cacheduuid) = do
-- Generate UUID from the gcrypt-id