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.
Avery Pennarun committed
Oct 2, 2009 at 16:09 UTC
2275f7077d5ea2bb9201599dec0dd8f2a5de2e40
1 file changed
+3
-1
git-subtree.sh
+3
-1
@@ -214,12 +214,14 @@ find_existing_splits()
214
--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
215
while read a b junk; do
216
case "$a" in
217
- START) main="$b"; sq="$b" ;;
217
+ START) sq="$b" ;;
218
git-subtree-mainline:) main="$b" ;;
219
git-subtree-split:) sub="$b" ;;
220
END)
221
+ debug " Main is: '$main'"
222
if [ -z "$main" -a -n "$sub" ]; then
223
# squash commits refer to a subtree
224
+ debug " Squash: $sq from $sub"
225
cache_set "$sq" "$sub"
226
fi
227
if [ -n "$main" -a -n "$sub" ]; then