git-debrebase: merge: test suite: Check wreckage saving

[dgit.git] / tests / tests / unrepresentable

diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable
index 80b5a055d5ac1c7033050e14011a3924b3061ec1..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,20 +42,26 @@ 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'
+good
 
 badly-1 src.c 'mode or type changed'
        chmod +x src.c
        git add src.c
 badly-2
 
-badly-1 new 'non-default mode'
+badly-1 new 'creation with non-default mode'
        echo hi >new
        chmod 755 new
        git add new
 badly-2
 
 start
-attempt
+good
 
 t-ok