chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: Fix ref to #842577
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 6c55cba2a579fa83e4434972eea9b54831765c76..23daeace743e6e06e0fa36c5e81bdee43670eaa1 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-198,11
+198,11
@@
t-has-ancestor () {
fi
}
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 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 "*) ;;
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;