summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-subtree.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-subtree.sh b/git-subtree.sh
index 09992e39d5..cdf7b0992b 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -538,7 +538,10 @@ cmd_split()
# ugly. is there no better way to tell if this is a subtree
# vs. a mainline commit? Does it matter?
- [ -z $tree ] && continue
+ if [ -z $tree ]; then
+ cache_set $rev $rev
+ continue
+ fi
newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
debug " newrev is: $newrev"