Skip to content

Commit

Permalink
Skip commit objects that should be trees, rather than copying them.
Browse files Browse the repository at this point in the history
An improvement on the previous patch, based on more reports from Sum-Wai
Low.
  • Loading branch information
apenwarr committed Mar 1, 2011
1 parent 856bea1 commit 2793ee6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-subtree.sh
Expand Up @@ -398,6 +398,7 @@ subtree_for_commit()
while read mode type tree name; do while read mode type tree name; do
assert [ "$name" = "$dir" ] assert [ "$name" = "$dir" ]
assert [ "$type" = "tree" -o "$type" = "commit" ] assert [ "$type" = "tree" -o "$type" = "commit" ]
[ "$type" = "commit" ] && continue # ignore submodules
echo $tree echo $tree
break break
done done
Expand Down

0 comments on commit 2793ee6

Please sign in to comment.