fix for subtree split not finding proper base for new commits
Jakub Suder committed
Jan 9, 2010 at 23:01 UTC
da949cc554304bf9dc2b20ffcd470fb6b8a35576
1 file changed
+4
-1
git-subtree.sh
+4
-1
@@ -538,7 +538,10 @@ cmd_split()
538
539
# ugly. is there no better way to tell if this is a subtree
540
# vs. a mainline commit? Does it matter?
541
- [ -z $tree ] && continue
541
+ if [ -z $tree ]; then
542
+ cache_set $rev $rev
543
+ continue
544
+ fi
545
546
newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
547
debug " newrev is: $newrev"