Merge branch 'ja/i18n-fix'

diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 2bdcf83808bb070ebebc9eebc5d2852a5743fad4..38bd876cabf9757cce439be90c0f1e094225cac3 100755 (executable)
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -84,4 +84,11 @@ test_expect_success 'rebase --onto outputs the invalid ref' '
        test_i18ngrep "invalid-ref" err
 '
 
+test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
+       test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
+       test_i18ngrep "numerical value" err &&
+       test_must_fail git rebase --whitespace=bad HEAD 2>err &&
+       test_i18ngrep "Invalid whitespace option" err
+'
+
 test_done