From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 18:57:03 +0000 (+0000)
Subject: git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=44bc892e4a92b33006a15edd2db4d25c4b3002c9;p=dgit.git

git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index f2b2417c..94fad3bb 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -43,18 +43,23 @@ nmu-upload-2
 
 : 'done the nmu, switching back to the maintainer hat'
 
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+nmu-fold () {
+	t-dgit fetch
+	git merge --ff-only dgit/dgit/sid
 
-git diff --exit-code patch-queue/nmu
+	git diff --exit-code patch-queue/$nmubranch
 
-git branch t.before
+	git branch unlaundered.$nmubranch
 
-t-git-debrebase
-t-gdr-good laundered
+	t-git-debrebase
+
+	t-gdr-good laundered
+
+	t-git-debrebase stitch
+	t-gdr-good stitched
+}
 
-t-git-debrebase stitch
-t-gdr-good stitched
+nmu-fold
 
 v=2.0-3
 t-dch-commit -v $v -m "incorporate nmu"