git-debrebase: NOTES: about divergence and merges

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 6d11009d8013ddf168d31a37a280d9f49fe76383..74c571ab7743aa2bd7e705a96ec06f943206ddb7 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -20,7 +20,7 @@ t-gdr-good () {
        #   stitched
        #   patches
 
-       git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
+       git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
        local etype netype
 
@@ -108,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
+}