Merge branch 'cb/diff-fname-optim' into maint

diff --git a/t/t7402-submodule-rebase.sh b/t/t7402-submodule-rebase.sh
index 5becb3ec5481b2407a18e59a426241be8f684051..f919c8d34de41b2ec3fe08c217dd2c6276cf8472 100755 (executable)
--- a/t/t7402-submodule-rebase.sh
+++ b/t/t7402-submodule-rebase.sh
@@ -71,7 +71,7 @@ test_expect_success 'rebase with dirty file and submodule fails' '
        test_tick &&
        git commit -m rewrite file &&
        echo dirty > file &&
-       ! git rebase --onto HEAD~2 HEAD^
+       test_must_fail git rebase --onto HEAD~2 HEAD^
 
 '