summaryrefslogtreecommitdiff
path: root/tests/lib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/lib b/tests/lib
index 6c55cba..23daeac 100644
--- a/tests/lib
+++ b/tests/lib
@@ -198,11 +198,11 @@ t-has-ancestor () {
fi
}
-t-has-parent () {
- # t-has-parent CHILD PARENT
+t-has-parent-or-is () {
+ # t-has-parent-or-is CHILD PARENT
local child=$1
local parent=$2
- local parents=$(git show --pretty=format:' %P ' "$child")
+ local parents=$(git show --pretty=format:' %P %H ' "$child")
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;