X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-makepatches7;h=935698796005f26548e983d6596a193601a1ab3b;hb=2df5e989bcbb8d4d8510e4322f3db964e5b9ca9c;hp=52462d4a5367e597ab1a1f58d59a84d0d0d1597f;hpb=89108c5f44ad57febbb24a28d605a5c6322d14c2;p=dgit.git

diff --git a/tests/tests/gdr-makepatches7 b/tests/tests/gdr-makepatches7
index 52462d4a..93569879 100755
--- a/tests/tests/gdr-makepatches7
+++ b/tests/tests/gdr-makepatches7
@@ -13,7 +13,7 @@ git checkout upstream/2.0
 echo '*patch*' >>.gitignore
 git commit -m nasty .gitignore
 git tag v2.1
-GZIP=-1 git archive -o ../${p}_2.1.orig.tar.gz --prefix ${p}/ v2.1
+t-make-orig $p 2.1
 
 git checkout master
 t-git-debrebase new-upstream 2.1-1
@@ -27,11 +27,15 @@ t-some-changes for-dgit-fixup m
 
 t-git-debrebase
 
-t-expect-fail 'dgit: failed command: test-suite-break-git-debrebase' \
-t-dgit -wgf --git-debrebase=test-suite-break-git-debrebase quilt-fixup
+t-expect-fail 'dgit: failed command: false' \
+t-dgit -wgf --git-debrebase=false quilt-fixup
 
+git branch before-gdr-true
 t-dgit -wgf --git-debrebase=true quilt-fixup
 
+git reset --hard before-gdr-true
+t-dgit -wgf --git-debrebase=no-such-command-exists quilt-fixup
+
 t-some-changes for-make-patches-fails-then-dgit-fixup m
 
 t-expect-fail 'Patch export produced patch amendments' \