Skip commit objects that should be trees, rather than copying them.

An improvement on the previous patch, based on more reports from Sum-Wai
Low.

diff --git a/git-subtree.sh b/git-subtree.sh
index fa4e3e3661d4b0d092c35e019b160d1e4d4080c2..920c664bb7c7a4e1aa455479e2caef3d6c6dc786 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -398,6 +398,7 @@ subtree_for_commit()
        while read mode type tree name; do
                assert [ "$name" = "$dir" ]
                assert [ "$type" = "tree" -o "$type" = "commit" ]
+               [ "$type" = "commit" ] && continue  # ignore submodules
                echo $tree
                break
        done