| test_description='git merge |
| Testing merge when using a custom message for the merge commit.' |
| echo >exp.subject "custom message" |
| cp exp.subject exp.log && |
| echo >>exp.log "* tag 'c2':" && |
| test_expect_success 'setup' ' |
| test_expect_success 'merge c2 with a custom message' ' |
| git merge -m "$(cat exp.subject)" c2 && |
| git cat-file commit HEAD | sed -e "1,/^$/d" >actual && |
| test_cmp exp.subject actual |
| test_expect_success 'merge --log appends to custom message' ' |
| git merge --log -m "$(cat exp.subject)" c2 && |
| git cat-file commit HEAD | sed -e "1,/^$/d" >actual && |