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 0949fefe20112d7d03e3036286313453a6da156b..cccc3400fdd8e3a06ccf8ac8f17589ca08afbffb 100755 (executable)
--- 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
                --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)
                        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
                                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
                                        cache_set "$sq" "$sub"
                                fi
                                if [ -n "$main" -a -n "$sub" ]; then