diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-04 20:13:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-04 20:13:25 -0400 |
| commit | bd7857d903a602bc5f1d5e01f0b936bb5b41b5c6 (patch) | |
| tree | d1c0d150a11d473f54157bf6039fb399958150f6 /Command/Watch.hs | |
| parent | cbf16f1967c247dfd41bc264fc994b6dae2620f9 (diff) | |
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.
Diffstat (limited to 'Command/Watch.hs')
| -rw-r--r-- | Command/Watch.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Watch.hs b/Command/Watch.hs index 31f171669..024d2c568 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. -} |