From 33bcee86f141d9504f688601440f72348626d2f1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 7 Jan 2021 13:44:23 -0400
Subject: [PATCH] avoid using wildcard near bug kyle fixed

---
 Git/Tree.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Git/Tree.hs b/Git/Tree.hs
index d5ac59ea74..ba62499ba5 100644
--- a/Git/Tree.hs
+++ b/Git/Tree.hs
@@ -260,7 +260,8 @@ 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
+	removed (RecordedSubTree _ _ _) = False
+	removed (NewSubTree _ _) = False
 
 	addoldnew [] new = new
 	addoldnew old [] = old
-- 
2.30.2