X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt;h=c9a50e9d1bd90cb8af8287359ab4a4941a87c1dd;hp=9a4b105741ffaf3f5d76c1e9d323acddcc0f83b8;hb=8c84500206dbe1b1cf4aea1f4b497ab279685066;hpb=36e765bdfb9e3b186be796d784f00a900050c295

diff --git a/tests/tests/quilt b/tests/tests/quilt
index 9a4b1057..c9a50e9d 100755
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -19,9 +19,7 @@ git fetch $tmp/incoming/$p dgit/sid:incoming
 
 dummy=0
 
-for cherry in incoming~1 incoming~0; do
-	git cherry-pick -x $cherry
-
+iteration () {
 	dummy=$(( $dummy + 1))
 	v=3.2.6-2~dummy${dummy}
 
@@ -29,7 +27,10 @@ for cherry in incoming~1 incoming~0; do
 	t-dgit --dpkg-buildpackage:-d build
 	t-dgit push
 	t-pushed-good dgit/sid
-done
+}
+
+git cherry-pick -x incoming~1; iteration
+git cherry-pick -x incoming~0; iteration
 
 t-822-field ../${p}_${v}_*.changes Changes |
  grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'