unannex: Now skips files whose content is not present, rather than it being an error. This allows gradual conversion from one backend to another by running unannex followed by add in each repository.

1 files changed, 6 insertions, 2 deletions

diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index 288f9da44..2c60a23bb 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -29,8 +29,12 @@ seek = [withFilesInGit start]
 {- The unannex subcommand undoes an add. -}
 start :: CommandStartString
 start file = isAnnexed file $ \(key, backend) -> do
-	showStart "unannex" file
-	return $ Just $ perform file key backend
+	ishere <- inAnnex key
+	if ishere
+		then do
+			showStart "unannex" file
+			return $ Just $ perform file key backend
+		else return Nothing
 
 perform :: FilePath -> Key -> Backend -> CommandPerform
 perform file key backend = do