X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream;h=b45a0bfe1ea8382161a589a96651910de20a46a7;hb=35c89cd28f7089073a4f9aafc1b60d8bdc3aca8a;hp=59acca848343980edbe2d0b2d45aa350ae070a3f;hpb=1162e091e51107a84f3da3fa2a2cbc72f9c0805a;p=dgit.git

diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index 59acca84..b45a0bfe 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -28,21 +28,31 @@ git tag v2.1 upstream
 
 git branch before-new-upstream
 
+clog-check-1 () {
+	before=$1
+	date=$(git log --format=%aD -n1 debian/changelog)
+	git show $before:debian/changelog >../clog.before
+	m="  * Update to new upstream version ${v%-*}."
+	e="dgit test git user <dgit-test@debian.example.net>  $date"
+}
+clog-check-2 () {
+	diff -u ../clog.expected debian/changelog
+}
+
 : ----- ordinary new upstream test -----
 
 t-git-debrebase new-upstream ${v%-*}
 
-date=$(git log --format=%aD -n1 debian/changelog)
-cat >../clog.expected <<END
+clog-check-1 before-new-upstream
+cat - <<END ../clog.before >../clog.expected
 example ($v) UNRELEASED; urgency=medium
 
-  * Update to new upstream version ${v%-*}.
+$m
 
- -- dgit test git user <dgit-test@debian.example.net>  $date
+ -- $e
 
 END
-git show before-new-upstream:debian/changelog >>../clog.expected
-diff -u ../clog.expected debian/changelog
+clog-check-2
 
 t-gdr-good laundered
 git reflog | egrep 'debrebase new-upstream.*checkout'
@@ -54,7 +64,7 @@ git branch ordinary
 
 : ----- 'with --anchor' -----
 
-git reset --hard startpoint
+git checkout -b with-anchor startpoint
 
 t-git-debrebase analyse >../anal.anch
 anchor=$(perl <../anal.anch -ne '