t7405: verify 'merge --abort' works after submodule/path conflicts

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index f0f6e2a5f3d015cb8d753c3d965c1c42e27b5784..f20f03c1039256f0bc674e3969176a2c592919dd 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -320,4 +320,14 @@ test_expect_success 'prune: handle HEAD reflog in multiple worktrees' '
        test_cmp expected actual
 '
 
+test_expect_success 'prune: handle expire option correctly' '
+       test_must_fail git prune --expire 2>error &&
+       test_i18ngrep "requires a value" error &&
+
+       test_must_fail git prune --expire=nyah 2>error &&
+       test_i18ngrep "malformed expiration" error &&
+
+       git prune --no-expire
+'
+
 test_done