From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 2 Oct 2009 20:09:09 +0000 (-0400)
Subject: Fix a minor problem in identifying squashes vs. normal splits.
X-Git-Tag: v1.7.11-rc0~176^2~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2275f7077d5ea2bb9201599dec0dd8f2a5de2e40;p=git.git

Fix a minor problem in identifying squashes vs. normal splits.

This didn't seem to have any noticeable side effects other than
suspicious-looking log messages when you used -d.
---

diff --git a/git-subtree.sh b/git-subtree.sh
index 0949fefe2..cccc3400f 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -214,12 +214,14 @@ find_existing_splits()
 		--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
 	while read a b junk; do
 		case "$a" in
-			START) main="$b"; sq="$b" ;;
+			START) sq="$b" ;;
 			git-subtree-mainline:) main="$b" ;;
 			git-subtree-split:) sub="$b" ;;
 			END)
+				debug "  Main is: '$main'"
 				if [ -z "$main" -a -n "$sub" ]; then
 					# squash commits refer to a subtree
+					debug "  Squash: $sq from $sub"
 					cache_set "$sq" "$sub"
 				fi
 				if [ -n "$main" -a -n "$sub" ]; then