diff options
| -rw-r--r-- | tests/lib-gdr | 5 | ||||
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu | 3 | ||||
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu-dgit | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index da119bc..ac4a476 100644 --- 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 diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index e647f80..8f0b9cb 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -31,8 +31,7 @@ t-maintainer-commit-some-changes t-dgit fetch t-git-next-date -t-expect-fail E:'Not.*fast-forward' \ -git merge --ff-only dgit/dgit/sid +t-nmu-causes-ff-fail : 'ad hocery' diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index f7bf3d5..02fb2f7 100755 --- a/tests/tests/gdr-diverge-nmu-dgit +++ b/tests/tests/gdr-diverge-nmu-dgit @@ -35,8 +35,7 @@ t-maintainer-commit-some-changes t-dgit fetch t-git-next-date -t-expect-fail E:'Not.*fast-forward' \ -git merge --ff-only dgit/dgit/sid +t-nmu-causes-ff-fail : 'rebase nmu onto our branch' |