Make tests pass with recent git (1.7.0 and up).
It seems that in older versions, --message="" was interpreted as "use the default commit message" instead of "use an empty commit message", and git-subtree was depending on this behaviour. Now we don't, so tests pass again.
Avery Pennarun committed
Feb 6, 2010 at 15:05 UTC
349a70d5cf127222c8a089f116070614ebd18732
1 file changed
+5
-1
git-subtree.sh
+5
-1
@@ -603,7 +603,11 @@ cmd_merge()
603
rev="$new"
604
fi
605
606
- git merge -s subtree --message="$message" $rev
606
+ if [ -n "$message" ]; then
607
+ git merge -s subtree --message="$message" $rev
608
+ else
609
+ git merge -s subtree $rev
610
+ fi
611
}
612
613
cmd_pull()