diff options
-rw-r--r-- | tests/lib | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |