diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-03 14:51:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-03 14:51:57 -0400 |
| commit | d651d4985b9fca2fbeeab2f1b700e6423994c400 (patch) | |
| tree | 5b24d489aa5a8f35f3bbe100c6d844afbdfa150d /Content.hs | |
| parent | 7ea9f52c2859a72f8e46522338c1c8a112549d84 (diff) | |
some initial support for local bare repos
This relies on git-annex's behavior of reading the config of local repos.
That allows repoIsLocalBare to examine the git config for core.bare.
Hopefully, gitAnnexLocation, gitAnnexDir, and gitAnnexObjectDir
are only used on local repos. But, I have not audited fully, since
they're probably not (see for example copyToRemote). And so,
the functions fall back to their old non-bare-aware behavior for
non-local repos.
Diffstat (limited to 'Content.hs')
| -rw-r--r-- | Content.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Content.hs b/Content.hs index cb954f4a0..658d9a861 100644 --- a/Content.hs +++ b/Content.hs @@ -51,8 +51,8 @@ calcGitLink file key = do let absfile = case absNormPath cwd file of Just f -> f Nothing -> error $ "unable to normalize " ++ filePathToString file - return $ relPathDirToDir (parentDir absfile) (Git.workTree g) ++ - annexLocation key + return $ relPathDirToDir (parentDir absfile) + (Git.workTree g) </> ".git" </> annexLocation key {- Updates the LocationLog when a key's presence changes. -} logStatus :: Key -> LogStatus -> Annex () |