diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index d21cd290d..72ef2e55d 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -465,8 +465,15 @@ test_expect_success 'merge log message' ' git merge --no-log c2 && git show -s --pretty=format:%b HEAD >msg.act && verify_diff msg.nolog msg.act "[OOPS] bad merge log message" && + git merge --log c3 && git show -s --pretty=format:%b HEAD >msg.act && + verify_diff msg.log msg.act "[OOPS] bad merge log message" && + + git reset --hard HEAD^ && + git config merge.log yes && + git merge c3 && + git show -s --pretty=format:%b HEAD >msg.act && verify_diff msg.log msg.act "[OOPS] bad merge log message" ' |