From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Nov 2013 19:18:36 +0000 (+0000)
Subject: autopkgtests: t-has-ancestor: cope with tag args and return a commit
X-Git-Tag: debian/0.19~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=08c5073f750f45f976c534f55804ed61adee4743

autopkgtests: t-has-ancestor: cope with tag args and return a commit
---

diff --git a/tests/lib b/tests/lib
index 6f255806..b6bf8108 100644
--- a/tests/lib
+++ b/tests/lib
@@ -50,8 +50,8 @@ t-git-none () {
 }
 
 t-has-ancestor () {
-	local ancestor=`git rev-parse $1`
 	local now=`git rev-parse HEAD`
+	local ancestor=`git rev-parse $1^{}`
 	local mbase=`git merge-base $ancestor $now`
 	if [ x$mbase != x$ancestor ]; then
 		echo "not ff $ancestor..$now, $mbase != $ancestor"