From bd7857d903a602bc5f1d5e01f0b936bb5b41b5c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 20:13:25 -0400 Subject: [PATCH] ignore-unmatch when removing a staged file When a file is added, and then deleted before the add action runs, the delete event was unhappy that the file never did get staged. --- Command/Watch.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/Watch.hs b/Command/Watch.hs index 31f1716696..024d2c568a 100644 --- a/Command/Watch.hs +++ b/Command/Watch.hs @@ -95,7 +95,7 @@ onAddSymlink file = go =<< Backend.lookupFile file onDel :: FilePath -> Annex () onDel file = inRepo $ Git.Command.run "rm" - [Params "--quiet --cached --", File file] + [Params "--quiet --cached --ignore-unmatch --", File file] {- A directory has been deleted, or moved, so tell git to remove anything - that was inside it from its cache. -}