mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid queueing rm of no files

Browse source
This commit is contained in:
Joey Hess 2013-02-05 15:11:05 -04:00
parent 5c29750921
commit 39d5f3f11c
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Sync.hs
View file

@ -226,7 +226,8 @@ resolveMerge = do
void $ liftIO cleanup void $ liftIO cleanup
(deleted, cleanup2) <- inRepo (LsFiles.deleted [top]) (deleted, cleanup2) <- inRepo (LsFiles.deleted [top])
Annex.Queue.addCommand "rm" [Params "--quiet -f --"] deleted unless (null deleted) $
Annex.Queue.addCommand "rm" [Params "--quiet -f --"] deleted
void $ liftIO cleanup2 void $ liftIO cleanup2
when merged $ do when merged $ do