From a9c942b0e0924786951e934335b864b708d3cc38 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Dec 2015 14:20:32 -0400 Subject: clean filter should update location log when adding new content to annex --- Command/Clean.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Command') diff --git a/Command/Clean.hs b/Command/Clean.hs index 1793ddedb..15dcdfacb 100644 --- a/Command/Clean.hs +++ b/Command/Clean.hs @@ -15,11 +15,12 @@ import Annex.FileMatcher import Types.KeySource import Types.Key import Backend +import Logs.Location import qualified Data.ByteString.Lazy as B cmd :: Command -cmd = dontCheck repoExists $ +cmd = noMessages $ dontCheck repoExists $ command "clean" SectionPlumbing "git clean filter" paramFile (withParams seek) @@ -57,8 +58,11 @@ ingest file = do -- Hard link (or copy) file content to annex -- to prevent it from being lost when git checks out -- a branch not containing this file. - unlessM (linkAnnex k file) $ - error "Problem adding file to the annex" + r <- linkAnnex k file + case r of + LinkAnnexFailed -> error "Problem adding file to the annex" + LinkAnnexOk -> logStatus k InfoPresent + LinkAnnexNoop -> noop genMetaData k file =<< liftIO (getFileStatus file) return k -- cgit v1.2.3