From: Jakub Suder <jakub.suder@gmail.com>
Date: Sat, 9 Jan 2010 22:01:39 +0000 (+0100)
Subject: fix for subtree split not finding proper base for new commits
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=da949cc554304bf9dc2b20ffcd470fb6b8a35576;p=git.git

fix for subtree split not finding proper base for new commits
---

diff --git a/git-subtree.sh b/git-subtree.sh
index 09992e39d..cdf7b0992 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"