diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 12:30:08 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:59 +0100 |
commit | 27f43c89f66b2ca6d159a38cabb942ca18774857 (patch) | |
tree | 3bdd265b067bb8ff44593805153f02e5db304f35 /tests/lib-gdr | |
parent | 1ee8b4c148023302d6a90d662c90bd39a070e764 (diff) |
git-debrebase: test suite: spot any merges which have multiple identical parents
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-gdr')
-rw-r--r-- | tests/lib-gdr | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 565e0b1..9a23cd5 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' ;; |