diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2011-02-28 20:48:50 -0800 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2011-02-28 20:48:50 -0800 |
| commit | 2793ee6ba6da57d97e9c313741041f7eb2e88974 (patch) | |
| tree | 68728f3cda6acc49dc6c70ea4e63b7eade597ca8 | |
| parent | 856bea1f71db30339539b0c917d6d7dc32729d0f (diff) | |
| download | git-2793ee6ba6da57d97e9c313741041f7eb2e88974.tar.gz | |
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.
| -rwxr-xr-x | git-subtree.sh | 1 |
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 |