diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-04 15:46:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-04 15:46:33 -0400 |
| commit | a7cc06b30d3ae8a9801a68729db23dd66f8dadf6 (patch) | |
| tree | b500f785b37815cf82d82da299881e07931ab27c /Remote/Git.hs | |
| parent | 307212395c912ab268109521ceae1bf192f728d8 (diff) | |
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.
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 31396003b..eecc9cf2a 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -111,6 +111,7 @@ gen r u _ gc = go <$> remoteCost gc defcst else Nothing , repo = r , gitconfig = gc + { remoteGitConfig = Just $ extractGitConfig r } , readonly = Git.repoIsHttp r , globallyAvailable = not $ Git.repoIsLocal r || Git.repoIsLocalUnknown r , remotetype = remote @@ -332,7 +333,8 @@ copyFromRemote r key file dest copyFromRemoteCheap :: Remote -> Key -> FilePath -> Annex Bool copyFromRemoteCheap r key file | not $ Git.repoIsUrl (repo r) = guardUsable (repo r) False $ do - loc <- liftIO $ gitAnnexLocation key (repo r) + loc <- liftIO $ gitAnnexLocation key (repo r) $ + fromJust $ remoteGitConfig $ gitconfig r liftIO $ catchBoolIO $ createSymbolicLink loc file >> return True | Git.repoIsSsh (repo r) = ifM (Annex.Content.preseedTmp key file) |