From 08c5073f750f45f976c534f55804ed61adee4743 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Nov 2013 19:18:36 +0000
Subject: autopkgtests: t-has-ancestor: cope with tag args and return a commit

---
 tests/lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/lib b/tests/lib
index 6f25580..b6bf810 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"
-- 
cgit v1.2.3