From ed717cf646829609be888d18b8a868751971d6d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Mar 2021 13:24:19 -0400 Subject: [PATCH] fix handling of subtree I don't think this actually fixes any buggy behavior in git-annex, I just noticed that using treeItemToLsTreeItem and then serializing it resulted in something starting with "160000 blob" rather than "160000 commit" --- Git/Tree.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Git/Tree.hs b/Git/Tree.hs index 9109c6e5f7..80a717a884 100644 --- a/Git/Tree.hs +++ b/Git/Tree.hs @@ -135,7 +135,10 @@ treeItemToTreeContent (TreeItem f m s) = case toTreeItemType m of treeItemToLsTreeItem :: TreeItem -> LsTree.TreeItem treeItemToLsTreeItem (TreeItem f mode sha) = LsTree.TreeItem { LsTree.mode = mode - , LsTree.typeobj = fmtObjectType BlobObject + , LsTree.typeobj = fmtObjectType $ case toTreeItemType mode of + Just TreeSubmodule -> CommitObject + Just TreeSubtree -> TreeObject + _ -> BlobObject , LsTree.sha = sha , LsTree.file = f }