X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=74c571ab7743aa2bd7e705a96ec06f943206ddb7;hb=ca03bca3d0443c539de63050693de56c9b2e0c03;hp=cb937734dac3c205521683d9ffe6764c6b859e81;hpb=61d6570d98dcc929a2f12c2ad6396dd03321cd78;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index cb937734..74c571ab 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -12,18 +12,16 @@ t-git-debrebase () {
 '
 }
 
-t-gdr-same-as-before () {
-	local beforetag=$1
-	git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
-}
-
-t-gdr-branch-structure () {
+t-gdr-good () {
 	local state=$1
+	local beforetag=$2 # say HEAD to skip this check
 	# state should be one of
 	#   laundered
 	#   stitched
 	#   patches
 
+	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
+
 	local etype netype
 
 	case $state in
@@ -110,3 +108,13 @@ t-some-changes () {
 	done
 	git commit -m "MIXED add both ($token)"
 }
+
+t-make-new-upstream-tarball () {
+	local uv=$1
+	git checkout make-upstream
+	# leaves ust set to filename of orig tarball
+	echo "upstream $uv" >>docs/README
+	git commit -a -m "upstream $uv tarball"
+	ust=example_$uv.orig.tar.gz
+	git archive -o ../$ust --prefix=example-2.0/ make-upstream
+}