mirror of
https://github.com/git/git.git
synced 2024-11-16 22:14:53 +01:00
f0ecac2b70
When the user specifies a message, use fmt_merge_msg_shortlog() to
append the shortlog.
Previously, when a message was specified, we ignored the merge title
("Merge <foo> into <bar>") and shortlog from fmt_merge_msg().
Update the documentation for -m to reflect this too.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
50 lines
1,021 B
Bash
Executable file
50 lines
1,021 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git merge
|
|
|
|
Testing merge when using a custom message for the merge commit.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
create_merge_msgs() {
|
|
echo >exp.subject "custom message"
|
|
|
|
cp exp.subject exp.log &&
|
|
echo >>exp.log "" &&
|
|
echo >>exp.log "* commit 'c2':" &&
|
|
echo >>exp.log " c2"
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
echo c0 > c0.c &&
|
|
git add c0.c &&
|
|
git commit -m c0 &&
|
|
git tag c0 &&
|
|
echo c1 > c1.c &&
|
|
git add c1.c &&
|
|
git commit -m c1 &&
|
|
git tag c1 &&
|
|
git reset --hard c0 &&
|
|
echo c2 > c2.c &&
|
|
git add c2.c &&
|
|
git commit -m c2 &&
|
|
git tag c2 &&
|
|
create_merge_msgs
|
|
'
|
|
|
|
|
|
test_expect_success 'merge c2 with a custom message' '
|
|
git reset --hard c1 &&
|
|
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 reset --hard c1 &&
|
|
git merge --log -m "$(cat exp.subject)" c2 &&
|
|
git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
|
|
test_cmp exp.log actual
|
|
'
|
|
|
|
test_done
|