undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for subtree split not finding proper base for new commits

Browse Source
This commit is contained in:
Jakub Suder 2010-01-09 23:01:39 +01:00
parent 0a562948ae
commit da949cc554
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-subtree.sh
View File

@ -538,7 +538,10 @@ cmd_split()
# ugly. is there no better way to tell if this is a subtree # ugly. is there no better way to tell if this is a subtree
# vs. a mainline commit? Does it matter? # 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 $? newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
debug " newrev is: $newrev" debug " newrev is: $newrev"