quilt fixup: Check that funny changes are represented properly

Specifically, do dgit push --dry-run.  This will check that the source
package and git tree agree - ie, that what we have produced can
round-trip through dpkg-source.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 91c3dafae76f9810c4c8203695bdf2be99534b2a..e82332f00d02c6e98425f779d1985e7ee9c7c085 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ dgit (3.12~) unstable; urgency=medium
   * import-dsc: Test missing files, particularly in ..
   * run git gc on tests/worktrees/example_1.0.tar.
   * quilt fixup: Check we can delete files with funny modes
+  * quilt fixup: Check that funny changes are represented properly
 
  --
 

diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable
index b2de45289396b2108ff978d5cf8898ef231266f4..e4b0da85a4e2fcb5c686697687ef210640ba063b 100755 (executable)
--- a/tests/tests/unrepresentable
+++ b/tests/tests/unrepresentable
@@ -12,6 +12,11 @@ cd $p
 
 start () { git checkout quilt-tip-1.1~0; }
 attempt () { t-dgit -wgf --quilt=smash quilt-fixup; }
+good () {
+       attempt
+       t-dgit --quilt=nofix -wgf build-source
+       t-dgit -wgf --dry-run push --new
+}
 
 badly-1 () {
        wrongfn=$1
@@ -37,13 +42,13 @@ badly-2
 start
        git rm src.c
        git commit -m deleted
-attempt
+good
 
 start
        git rm orig-exec
        git rm -f orig-unwriteable
        git commit -m 'deleted funny'
-attempt
+good
 
 badly-1 src.c 'mode or type changed'
        chmod +x src.c
@@ -57,6 +62,6 @@ badly-1 new 'creation with non-default mode'
 badly-2
 
 start
-attempt
+good
 
 t-ok