diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-05 15:11:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-05 15:11:05 -0400 |
| commit | 5d50a29cc501f1b13f8695469c3bc58169193c32 (patch) | |
| tree | 18a9f8003d62f522cd41228f96e14338c4c26dcc | |
| parent | b659d4a2bc5fb85182ad0b77806041a7fca9026e (diff) | |
avoid queueing rm of no files
| -rw-r--r-- | Command/Sync.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 50e709a2d..6d3a76659 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -226,7 +226,8 @@ resolveMerge = do void $ liftIO cleanup (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 when merged $ do |