Merge branch 'maint'

diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index 220a740ee89af325d04321a45aafc275ed130610..1fb3e499b4a044d935c090bfa567a7ace271c054 100755 (executable)
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -89,7 +89,7 @@ test_expect_success 'same, but do not remove trailing spaces' '
        git config core.whitespace "-blank-at-eol" &&
        git reset --hard HEAD^ &&
        cp third file && git add file && git commit -m third &&
-       git rebase --whitespace=fix HEAD^^
+       git rebase --whitespace=fix HEAD^^ &&
        git diff --exit-code HEAD^:file expect-second &&
        test_cmp file third
 '