diff options
| author | Jakub Suder <jakub.suder@gmail.com> | 2010-01-09 23:01:39 +0100 |
|---|---|---|
| committer | Jakub Suder <jakub.suder@gmail.com> | 2010-01-10 13:09:26 +0100 |
| commit | da949cc554304bf9dc2b20ffcd470fb6b8a35576 (patch) | |
| tree | d019413d8401b6e860b3e82f9d96af4dcf8eb245 | |
| parent | 0a562948ae1fe7130f4e9a29ce4107311ab93b91 (diff) | |
fix for subtree split not finding proper base for new commits
| -rwxr-xr-x | git-subtree.sh | 5 |
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" |