From 27f43c89f66b2ca6d159a38cabb942ca18774857 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 12:30:08 +0000 Subject: [PATCH] git-debrebase: test suite: spot any merges which have multiple identical parents Signed-off-by: Ian Jackson --- tests/lib-gdr | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/lib-gdr b/tests/lib-gdr index 565e0b16..9a23cd5b 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -106,6 +106,11 @@ t-gdr-good () { local cnparents=`printf "%s" "$parents" | wc -w` test $cnparents = $enparents + local cndparents=` + for f in $parents; do echo $f; done | sort -u | wc -w + ` + test $cndparents = $cnparents + case "$parents" in *"$expect"*) ;; *) fail 'unexpected parent' ;; -- 2.30.2