diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-17 19:18:36 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-24 17:45:28 +0000 |
commit | 08c5073f750f45f976c534f55804ed61adee4743 (patch) | |
tree | e7ff0b2e6860f64a6d955b3d986fd050db704fe8 | |
parent | 6309752e70ca68475a6dae69ab41a40862caa6c5 (diff) |
autopkgtests: t-has-ancestor: cope with tag args and return a commit
-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" |