diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 00:10:04 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
commit | 51a8006237f3882101297df7b5c29f2d15a7641e (patch) | |
tree | 369c5318aa205c5415eef2141df0c2aff883e251 /tests/lib-gdr | |
parent | fe0439371d17132ccb6b7a00f1ee57c0576e44fc (diff) |
git-debrebase: test suite: gdr nmu divergence: do maintainer first
In practical terms this is needed because we are only using one tree,
and otherwise the nmu's dgit push will update dgit/dgit/sid, causing
the ffq check to fail (when we fix it, in a moment).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-gdr')
-rw-r--r-- | tests/lib-gdr | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index ac4a476..0fc55e3 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -204,6 +204,8 @@ t-maintainer-commit-some-changes () { } t-nmu-causes-ff-fail () { + t-dgit fetch + t-expect-fail E:'Not.*fast-forward' \ git merge --ff-only dgit/dgit/sid } |