From fd161da2c2d024167f6a5284dab97f6b95954d1b Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Wed, 6 Jan 2021 19:16:30 -0500
Subject: [PATCH] adjustTree: Consider submodule deletions

In addition to regular file deletions, the removefiles argument passed
to adjustTree may contain removed submodules.  When making the new
tree, filter these out in the same way that is done for regular files
so that the deletion is propagated.
---
 Git/Tree.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Git/Tree.hs b/Git/Tree.hs
index 491314fff5..d5ac59ea74 100644
--- a/Git/Tree.hs
+++ b/Git/Tree.hs
@@ -259,6 +259,7 @@ adjustTree adjusttreeitem addtreeitems resolveaddconflict removefiles r repo =
 
 	removeset = S.fromList $ map (normalise . gitPath) removefiles
 	removed (TreeBlob f _ _) = S.member (normalise (gitPath f)) removeset
+	removed (TreeCommit f _ _) = S.member (normalise (gitPath f)) removeset
 	removed _ = False
 
 	addoldnew [] new = new