diff -r 601e3658216d -r d4cf80341589 hgext/git/dirstate.py
--- a/hgext/git/dirstate.py	Mon Sep 07 17:14:59 2020 -0400
+++ b/hgext/git/dirstate.py	Mon Sep 07 17:16:16 2020 -0400
@@ -303,8 +303,10 @@
     def drop(self, f):
         index = self.git.index
         index.read()
-        index.remove(pycompat.fsdecode(f))
-        index.write()
+        fs = pycompat.fsdecode(f)
+        if fs in index:
+            index.remove(fs)
+            index.write()
 
     def remove(self, f):
         index = self.git.index