From: Avery Pennarun <apenwarr@gmail.com>
Date: Sat, 6 Feb 2010 20:05:17 +0000 (-0500)
Subject: Make tests pass with recent git (1.7.0 and up).
X-Git-Tag: v1.7.11-rc0~176^2~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=349a70d5cf127222c8a089f116070614ebd18732;p=git.git

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.
---

diff --git a/git-subtree.sh b/git-subtree.sh
index 11cda9ea8..009c0db9b 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()