X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu-dgit;h=bb6a19f40715f678e408bdfc95e00429a9887075;hb=638d0a7a2a714d58d831e51d759533770a4fbfab;hp=f7bf3d51f4469100034c22456c1b76086d5ada35;hpb=70e4369aa8239f967f89d0972e964b8dc9b2e3b5;p=dgit.git

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index f7bf3d51..bb6a19f4 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -10,9 +10,18 @@ cd $p
 
 t-dgit setup-mergechangelogs
 
+: 'maintainer'
+
+git checkout master
+
+v=2.0-3
+t-maintainer-commit-some-changes
+
+t-git-next-date
+
 : 'nmu'
 
-git checkout -b nmu
+git checkout -b nmu origin/master~0
 
 t-git-next-date
 
@@ -25,20 +34,11 @@ t-dgit -wgf push-source
 
 t-archive-process-incoming sid
 
-: 'maintainer'
-
-git checkout master
-
-v=2.0-3
-t-maintainer-commit-some-changes
+: 'rebase nmu onto our branch'
 
-t-dgit fetch
 t-git-next-date
-
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
-
-: 'rebase nmu onto our branch'
+git checkout master
+t-nmu-causes-ff-fail
 
 git checkout dgit/dgit/sid # detach