summaryrefslogtreecommitdiff
path: root/tests/lib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib2
1 files changed, 1 insertions, 1 deletions
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"