improved rev_is_descendant_of_branch() function

pivotalexperimental · Jan 12, 2010 · 6bd910a · 6bd910a
1 parent 4a6ea5c
commit 6bd910a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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