t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh
index d59acc8d1ade041d01d5a45aa993b26919a0170c..ca8a00ed0af0382c20a4883e5aa5f1914b6ecd3f 100755 (executable)
--- a/t/t9106-git-svn-dcommit-clobber-series.sh
+++ b/t/t9106-git-svn-dcommit-clobber-series.sh
@@ -22,6 +22,7 @@ test_expect_success '(supposedly) non-conflicting change from SVN' "
        cd tmp &&
                perl -i -p -e 's/^58\$/5588/' file &&
                perl -i -p -e 's/^61\$/6611/' file &&
+               poke file &&
                test x\"\`sed -n -e 58p < file\`\" = x5588 &&
                test x\"\`sed -n -e 61p < file\`\" = x6611 &&
                svn commit -m '58 => 5588, 61 => 6611' &&
@@ -53,10 +54,10 @@ test_expect_success 'change file but in unrelated area' "
                test x\"\`sed -n -e 61p < file\`\" = x6611
        "
 
-test_expect_failure 'attempt to dcommit with a dirty index' '
+test_expect_success 'attempt to dcommit with a dirty index' '
        echo foo >>file &&
        git add file &&
-       git svn dcommit
+       ! git svn dcommit
 '
 
 test_done