Merge branch 'ap/maint-apply-modefix' into maint

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 3a36a95b9ac42b35e680109df4daf87fc219fb53..e5b210bc960c8433d6758f3932a86647208297ef 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -544,4 +544,20 @@ test_expect_success 'merge early part of c2' '
 
 test_debug 'gitk --all'
 
+test_expect_success 'merge --no-ff --no-commit && commit' '
+       git reset --hard c0 &&
+       git merge --no-ff --no-commit c1 &&
+       EDITOR=: git commit &&
+       verify_parents $c0 $c1
+'
+
+test_debug 'gitk --all'
+
+test_expect_success 'amending no-ff merge commit' '
+       EDITOR=: git commit --amend &&
+       verify_parents $c0 $c1
+'
+
+test_debug 'gitk --all'
+
 test_done