diff options
| -rw-r--r-- | Command/Sync.hs | 11 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 5bc412cc9..ce1faa7f5 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -34,8 +34,7 @@ import Git.FileMode import Annex.Wanted import Annex.Content import Command.Get (getKeyFile') -import Logs.Transfer -import Logs.Presence +import qualified Command.Move import Logs.Location import Annex.Drop @@ -558,11 +557,5 @@ syncFile rs f (k, _) = do put dest = do ok <- commandAction $ do showStart "copy" f - showAction $ "to " ++ Remote.name dest - next $ next $ do - ok <- upload (Remote.uuid dest) k (Just f) noRetry $ - Remote.storeKey dest k (Just f) - when ok $ - Remote.logStatus dest k InfoPresent - return ok + next $ Command.Move.toPerform dest False k (Just f) return (ok, if ok then Just (Remote.uuid dest) else Nothing) diff --git a/debian/changelog b/debian/changelog index fdd909c53..ab239d462 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,13 @@ git-annex (5.20140128) UNRELEASED; urgency=medium * sync --content: Re-pull from remotes after downloading content, since that can take a while and other changes may be pushed in the meantime. + * sync --content: Reuse smart copy code from copy command, including + handling and repairing out of date location tracking info. + Closes: #737480 * Added ways to configure rsync options to be used only when uploading or downloading from a remote. Useful to eg limit upload bandwidth. + * Document in man page that sshcaching uses ssh ControlMaster. + Closes: #737476 -- Joey Hess <joeyh@debian.org> Tue, 28 Jan 2014 13:57:19 -0400 diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index ef935921b..90774a74b 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1214,7 +1214,8 @@ Here are all the supported configuration settings. * `annex.sshcaching` - By default, git-annex caches ssh connections + By default, git-annex caches ssh connections using ssh's + ControlMaster and ControlPersist settings (if built using a new enough ssh). To disable this, set to `false`. * `annex.alwayscommit` |