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 /Command/Add.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 'Command/Add.hs')
| -rw-r--r-- | Command/Add.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 2671126ca..51921fbc3 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -230,7 +230,7 @@ undo file key e = do {- Creates the symlink to the annexed content, returns the link target. -} link :: FilePath -> Key -> Maybe InodeCache -> Annex String link file key mcache = flip catchNonAsync (undo file key) $ do - l <- inRepo $ gitAnnexLink file key + l <- calcRepo $ gitAnnexLink file key replaceFile file $ makeAnnexLink l -- touch symlink to have same time as the original file, @@ -272,7 +272,7 @@ cleanup :: FilePath -> Key -> Maybe InodeCache -> Bool -> CommandCleanup cleanup file key mcache hascontent = do ifM (isDirect <&&> pure hascontent) ( do - l <- inRepo $ gitAnnexLink file key + l <- calcRepo $ gitAnnexLink file key stageSymlink file =<< hashSymlink l , addLink file key mcache ) |