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-*: break out t-nmu-causes-ff-fail
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index da119bca098ee1048250c7d7e419a21a6ef64eff..ac4a476ea3596ba34cd87f85c24b654a8c6d6889 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-203,6
+203,11
@@
t-maintainer-commit-some-changes () {
t-git-next-date
}
+t-nmu-causes-ff-fail () {
+ t-expect-fail E:'Not.*fast-forward' \
+ git merge --ff-only dgit/dgit/sid
+}
+
t-nmu-reconciled-good () {
local nmutree=$1