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 /Assistant | |
| 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 'Assistant')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 2c1addb24..3f8debdc2 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -352,7 +352,7 @@ handleAdds havelsof delayadd cs = returnWhen (null incomplete) $ do done change mcache file key = liftAnnex $ do logStatus key InfoPresent link <- ifM isDirect - ( inRepo $ gitAnnexLink file key + ( calcRepo $ gitAnnexLink file key , Command.Add.link file key mcache ) whenM (pure DirWatcher.eventsCoalesce <||> isDirect) $ diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index ca9de6836..6f3afa8ca 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -232,7 +232,7 @@ onAddDirect symlinkssupported matcher file fs = do - so it symlink is restaged to make sure. -} ( ifM (shouldRestage <$> getDaemonStatus) ( do - link <- liftAnnex $ inRepo $ gitAnnexLink file key + link <- liftAnnex $ calcRepo $ gitAnnexLink file key addLink file link (Just key) , noChange ) @@ -279,7 +279,7 @@ onAddSymlink' linktarget mk isdirect file filestatus = go mk go (Just key) = do when isdirect $ liftAnnex $ void $ addAssociatedFile key file - link <- liftAnnex $ inRepo $ gitAnnexLink file key + link <- liftAnnex $ calcRepo $ gitAnnexLink file key if linktarget == Just link then ensurestaged (Just link) =<< getDaemonStatus else do |