diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-27 17:38:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-27 17:38:06 -0400 |
| commit | df81023501e2b0d930ec90cc6f5a6c6735f84818 (patch) | |
| tree | 5bd3b9d8f91464bd27c9d86f700b975a76067147 /Annex/Direct.hs | |
| parent | 1e07d61b9669f85a02551d7858177bd33ffaea6f (diff) | |
Repository tuning parameters can now be passed when initializing a repository for the first time.
* init: Repository tuning parameters can now be passed when initializing a
repository for the first time. For details, see
http://git-annex.branchable.com/tuning/
* merge: Refuse to merge changes from a git-annex branch of a repo
that has been tuned in incompatable ways.
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index 06d0342c1..1c733cb55 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -86,7 +86,7 @@ stageDirect = do deletegit file stageannexlink file key = do - l <- inRepo $ gitAnnexLink file key + l <- calcRepo $ gitAnnexLink file key stageSymlink file =<< hashSymlink l void $ addAssociatedFile key file @@ -131,7 +131,7 @@ addDirect file cache = do return False got (Just (key, _)) = ifM (sameInodeCache file [cache]) ( do - l <- inRepo $ gitAnnexLink file key + l <- calcRepo $ gitAnnexLink file key stageSymlink file =<< hashSymlink l addInodeCache key cache void $ addAssociatedFile key file @@ -282,7 +282,7 @@ updateWorkTree d oldref = do - with the content. -} movein item makeabs k f = unlessM (goodContent k f) $ do preserveUnannexed item makeabs f oldref - l <- inRepo $ gitAnnexLink f k + l <- calcRepo $ gitAnnexLink f k replaceFile f $ makeAnnexLink l toDirect k f |