From b14d3f59c9aeb589033b7f712a2946e2d21e8b1a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 23:29:44 +0000 Subject: git-debrebase: test suite: lib-gdr: break out some more t-* Signed-off-by: Ian Jackson --- tests/tests/gdr-diverge-nmu | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'tests/tests') diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 9b37ca6..e647f80 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -56,24 +56,7 @@ t-gdr-good laundered t-git-debrebase stitch t-gdr-good stitched -: 'check that what we have is what is expected' -git checkout -b compare.nmu origin/master~0 -git checkout patch-queue/nmu . -git rm -rf debian/patches -git commit -m 'rm patches nmu' - -git checkout -b compare.maintainer origin/master~0 -git checkout did.maintainer . -git rm -rf --ignore-unmatch debian/patches -git commit --allow-empty -m 'rm patches maintainer' - -git merge compare.nmu -git diff --quiet master - -: 'check that dgit still likes it' - -git checkout master -t-dgit -wgf quilt-fixup +t-nmu-reconciled-good patch-queue/nmu t-ok -- cgit v1.2.3