summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-subtree.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-subtree.sh b/git-subtree.sh
index fa4e3e3661..920c664bb7 100755
--- 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