path: root/tests
diff options
authorIan Jackson <>2018-08-25 11:55:42 +0100
committerIan Jackson <>2018-08-25 12:55:17 +0100
commit17ff17bd19aff9d185f4771d35ce9663c364aeab (patch)
tree9b1c72f21bdd5397eb91b2e362ea79af197fd7dd /tests
parenta11bdb16b533806efcfc5e529d9394963afa1ee6 (diff)
test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches
Now dgit runs git-debrebase make-patches, with the result that the patch commit in this conflict will be made by gdr. This is what we want, so now that we have it, insist on it. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'tests')
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index ad39577..007c35b 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -42,7 +42,7 @@ t-nmu-causes-ff-fail
git checkout dgit/dgit/sid # detach
-t-expect-fail 'E:CONFLICT.*Commit (patch queue|Debian 3\.0 \(quilt\) metadata)' \
+t-expect-fail 'E:CONFLICT.*Commit patch queue' \
git rebase master
git rebase --skip