summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-subtree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-subtree.sh b/git-subtree.sh
index cf50de150c..fa4e3e3661 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -397,7 +397,7 @@ subtree_for_commit()
git ls-tree "$commit" -- "$dir" |
while read mode type tree name; do
assert [ "$name" = "$dir" ]
- assert [ "$type" = "tree" ]
+ assert [ "$type" = "tree" -o "$type" = "commit" ]
echo $tree
break
done