chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ee8b4c
)
git-debrebase: test suite: spot any merges which have multiple identical parents
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:30:08 +0000
(12:30 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:59 +0000
(16:06 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/lib-gdr
patch
|
blob
|
history
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index 565e0b167ad1c104cd026e92c9637eda368c0775..9a23cd5bab5085db3a3b55f37d6fad5277c62100 100644
(file)
--- 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' ;;