From a7cc06b30d3ae8a9801a68729db23dd66f8dadf6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Apr 2013 15:46:33 -0400 Subject: Use lower case hash directories for storing files on crippled filesystems, same as is already done for bare repositories. * since this is a crippled filesystem anyway, git-annex doesn't use symlinks on it * so there's no reason to use the mixed case hash directories that we're stuck using to avoid breaking everyone's symlinks to the content * so we can do what is already done for all bare repos, and make non-bare repos on crippled filesystems use the all-lower case hash directories * which are, happily, all 3 letters long, so they cannot conflict with mixed case hash directories * so I was able to 100% fix this and even resuming `git annex add` in the test case will recover and it will all just work. --- Types/GitConfig.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Types/GitConfig.hs') diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index ff7cd3c90..c06e3ec6e 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -88,7 +88,8 @@ data RemoteGitConfig = RemoteGitConfig , remoteAnnexStartCommand :: Maybe String , remoteAnnexStopCommand :: Maybe String - -- these settings are specific to particular types of remotes + {- These settings are specific to particular types of remotes + - including special remotes. -} , remoteAnnexSshOptions :: [String] , remoteAnnexRsyncOptions :: [String] , remoteAnnexGnupgOptions :: [String] @@ -97,6 +98,8 @@ data RemoteGitConfig = RemoteGitConfig , remoteAnnexBupSplitOptions :: [String] , remoteAnnexDirectory :: Maybe FilePath , remoteAnnexHookType :: Maybe String + {- A regular git remote's git repository config. -} + , remoteGitConfig :: Maybe GitConfig } extractRemoteGitConfig :: Git.Repo -> String -> RemoteGitConfig @@ -117,6 +120,7 @@ extractRemoteGitConfig r remotename = RemoteGitConfig , remoteAnnexBupSplitOptions = getoptions "bup-split-options" , remoteAnnexDirectory = notempty $ getmaybe "directory" , remoteAnnexHookType = notempty $ getmaybe "hooktype" + , remoteGitConfig = Nothing } where getbool k def = fromMaybe def $ getmaybebool k -- cgit v1.2.3