assistant: Fix dropping content when a file is moved to an archive directory.

A transfer is queued, but if the file has already been transferred to the
remote before, the transfer is skipped. In this case, it needs to perform
any actions it would normally take after finishing the transfer, like
dropping the local object.

Assistant/Threads/Transferrer.hs

@@ -20,6 +20,7 @@ import Annex.Content
 import qualified Remote
 import Types.Key
 import Locations.UserConfig
+import Assistant.Threads.TransferWatcher
 
 import System.Process (create_group)
 
@@ -46,6 +47,7 @@ startTransfer program t info = case (transferRemote info, associatedFile info) o
 		, do
 			debug [ "Skipping unnecessary transfer:" , describeTransfer t info ]
 			void $ removeTransfer t
+			finishedTransfer t (Just info)
 			return Nothing
 		)
 	_ -> return Nothing

debian/changelog

@@ -7,6 +7,8 @@ git-annex (4.20130228) UNRELEASED; urgency=low
   * assistant: Logs are rotated to avoid them using too much disk space.
   * assistant: Avoid noise in logs from git commit about typechanged
     files in direct mode repositories.
+  * assistant: Fix dropping content when a file is moved to an archive
+    directory.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 27 Feb 2013 23:20:40 -0400