Merge branch 'sr/gpg-interface-stop-at-the-end' into maint

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 7f9c68cbe75a688357e6c71486c3897861421681..4ec5d9ec790a0d54f4883fc118b5df25c94f43f4 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -570,6 +570,12 @@ test_expect_success 'combining --squash and --no-ff is refused' '
        test_must_fail git merge --no-ff --squash c1
 '
 
+test_expect_success 'combining --squash and --commit is refused' '
+       git reset --hard c0 &&
+       test_must_fail git merge --squash --commit c1 &&
+       test_must_fail git merge --commit --squash c1
+'
+
 test_expect_success 'option --ff-only overwrites --no-ff' '
        git merge --no-ff --ff-only c1 &&
        test_must_fail git merge --no-ff --ff-only c2