diff options
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 "*) ;; |