chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: test suite: gdr nmu divergence: check that divergence check trips...
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index c91cdcc28cf14fc08df6da278bebc07694d020ed..f11d56350473a23a51a2e05ecf6cad0b48a1fa20 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-208,6
+208,9
@@
t-nmu-causes-ff-fail () {
t-expect-fail E:'Not.*fast-forward' \
git merge --ff-only dgit/dgit/sid
+
+ t-expect-fail E:'-fdiverged.*refs/remotes/dgit/dgit/sid' \
+ t-git-debrebase
}
t-nmu-reconciled-good () {