diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-25 17:31:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-25 17:31:07 -0400 |
| commit | 8beed17168aab12bb4045b6d8635b37503d5099b (patch) | |
| tree | 1332678e95f6ef8588164c4f82eeee6b8c59392f /Locations.hs | |
| parent | 1aa19422ac8748eeff219ac4f46df166dae783c5 (diff) | |
drop incomplete bare repo support
Added a bug about it.
Now git annex move --from works fully
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Locations.hs b/Locations.hs index 92918a7e0..c2c747e58 100644 --- a/Locations.hs +++ b/Locations.hs @@ -28,22 +28,22 @@ gitStateDir repo = (Git.workTree repo) ++ "/" ++ stateLoc - <backend:fragment> - - That allows deriving the key and backend by looking at the symlink to it. - - - - Note that even if the repo is a bare repo, the annex is put in a .git - - sub -} annexLocation :: Git.Repo -> Key -> FilePath annexLocation r key = (Git.workTree r) ++ "/" ++ (annexLocationRelative r key) -{- Annexed file's location relative to git's working tree. -} +{- Annexed file's location relative to git's working tree. + - + - Note: Assumes repo is NOT bare.-} annexLocationRelative :: Git.Repo -> Key -> FilePath -annexLocationRelative r key = Git.dir r ++ "/annex/" ++ (keyFile key) +annexLocationRelative r key = ".git/annex/" ++ (keyFile key) {- .git-annex/tmp is used for temp files - -} + - + - Note: Assumes repo is NOT bare. -} annexTmpLocation :: Git.Repo -> FilePath -annexTmpLocation r = (Git.workTree r) ++ "/" ++ Git.dir r ++ "/annex/tmp/" +annexTmpLocation r = (Git.workTree r) ++ ".git/annex/tmp/" {- Converts a key into a filename fragment. - |