From: Jakub Suder <jakub.suder@gmail.com>
Date: Tue, 12 Jan 2010 22:34:52 +0000 (+0100)
Subject: improved rev_is_descendant_of_branch() function
X-Git-Tag: v1.7.11-rc0~176^2~25^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bd910a82155ae3def5cf38acb27d36a192c449e;p=git.git

improved rev_is_descendant_of_branch() function
---

diff --git a/git-subtree.sh b/git-subtree.sh
index 48bc57039..66ce251ea 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -166,9 +166,9 @@ rev_is_descendant_of_branch()
 	newrev="$1"
 	branch="$2"
 	branch_hash=$(git rev-parse $branch)
-	match=$(git rev-list $newrev | grep $branch_hash)
+	match=$(git rev-list -1 $branch_hash ^$newrev)
 
-	if [ -n "$match" ]; then
+	if [ -z "$match" ]; then
 		return 0
 	else
 		return 1