From 349a70d5cf127222c8a089f116070614ebd18732 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Sat, 6 Feb 2010 15:05:17 -0500
Subject: [PATCH] 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.
---
 git-subtree.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/git-subtree.sh b/git-subtree.sh
index 11cda9ea82..009c0db9bc 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -603,7 +603,11 @@ cmd_merge()
 		rev="$new"
 	fi
 	
-	git merge -s subtree --message="$message" $rev
+	if [ -n "$message" ]; then
+		git merge -s subtree --message="$message" $rev
+	else
+		git merge -s subtree $rev
+	fi
 }
 
 cmd_pull()