2008-06-27 16:22:07 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2008-09-03 08:59:33 +00:00
|
|
|
test_description='git merge
|
2008-06-27 16:22:07 +00:00
|
|
|
|
|
|
|
Testing merge when using a custom message for the merge commit.'
|
|
|
|
|
2021-10-07 10:01:37 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2008-06-27 16:22:07 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2010-05-10 17:17:45 +00:00
|
|
|
create_merge_msgs() {
|
|
|
|
echo >exp.subject "custom message"
|
2010-05-10 17:17:46 +00:00
|
|
|
|
|
|
|
cp exp.subject exp.log &&
|
|
|
|
echo >>exp.log "" &&
|
2011-11-05 04:31:28 +00:00
|
|
|
echo >>exp.log "* tag 'c2':" &&
|
2010-05-10 17:17:46 +00:00
|
|
|
echo >>exp.log " c2"
|
2010-05-10 17:17:45 +00:00
|
|
|
}
|
|
|
|
|
2008-06-27 16:22:07 +00:00
|
|
|
test_expect_success 'setup' '
|
2019-04-17 10:23:23 +00:00
|
|
|
echo c0 >c0.c &&
|
2008-06-27 16:22:07 +00:00
|
|
|
git add c0.c &&
|
|
|
|
git commit -m c0 &&
|
|
|
|
git tag c0 &&
|
2019-04-17 10:23:23 +00:00
|
|
|
echo c1 >c1.c &&
|
2008-06-27 16:22:07 +00:00
|
|
|
git add c1.c &&
|
|
|
|
git commit -m c1 &&
|
|
|
|
git tag c1 &&
|
|
|
|
git reset --hard c0 &&
|
2019-04-17 10:23:23 +00:00
|
|
|
echo c2 >c2.c &&
|
2008-06-27 16:22:07 +00:00
|
|
|
git add c2.c &&
|
|
|
|
git commit -m c2 &&
|
2010-05-10 17:17:45 +00:00
|
|
|
git tag c2 &&
|
|
|
|
create_merge_msgs
|
2008-06-27 16:22:07 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge c2 with a custom message' '
|
|
|
|
git reset --hard c1 &&
|
2010-05-10 17:17:45 +00:00
|
|
|
git merge -m "$(cat exp.subject)" c2 &&
|
2019-04-17 10:23:23 +00:00
|
|
|
git cat-file commit HEAD >raw &&
|
|
|
|
sed -e "1,/^$/d" raw >actual &&
|
2010-05-10 17:17:45 +00:00
|
|
|
test_cmp exp.subject actual
|
2008-06-27 16:22:07 +00:00
|
|
|
'
|
|
|
|
|
2010-05-10 17:17:52 +00:00
|
|
|
test_expect_success 'merge --log appends to custom message' '
|
2010-05-10 17:17:46 +00:00
|
|
|
git reset --hard c1 &&
|
|
|
|
git merge --log -m "$(cat exp.subject)" c2 &&
|
2019-04-17 10:23:23 +00:00
|
|
|
git cat-file commit HEAD >raw &&
|
|
|
|
sed -e "1,/^$/d" raw >actual &&
|
2010-05-10 17:17:46 +00:00
|
|
|
test_cmp exp.log actual
|
|
|
|
'
|
|
|
|
|
2019-04-17 10:23:27 +00:00
|
|
|
mesg_with_comment_and_newlines='
|
|
|
|
# text
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'prepare file with comment line and trailing newlines' '
|
|
|
|
printf "%s" "$mesg_with_comment_and_newlines" >expect
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cleanup commit messages (verbatim option)' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
git merge --cleanup=verbatim -F expect c2 &&
|
|
|
|
git cat-file commit HEAD >raw &&
|
|
|
|
sed -e "1,/^$/d" raw >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cleanup commit messages (whitespace option)' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
test_write_lines "" "# text" "" >text &&
|
|
|
|
echo "# text" >expect &&
|
|
|
|
git merge --cleanup=whitespace -F text c2 &&
|
|
|
|
git cat-file commit HEAD >raw &&
|
|
|
|
sed -e "1,/^$/d" raw >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cleanup merge messages (scissors option)' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
cat >text <<-\EOF &&
|
|
|
|
|
|
|
|
# to be kept
|
|
|
|
|
|
|
|
# ------------------------ >8 ------------------------
|
|
|
|
# to be kept, too
|
|
|
|
# ------------------------ >8 ------------------------
|
|
|
|
to be removed
|
|
|
|
# ------------------------ >8 ------------------------
|
|
|
|
to be removed, too
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
# to be kept
|
|
|
|
|
|
|
|
# ------------------------ >8 ------------------------
|
|
|
|
# to be kept, too
|
|
|
|
EOF
|
|
|
|
git merge --cleanup=scissors -e -F text c2 &&
|
|
|
|
git cat-file commit HEAD >raw &&
|
|
|
|
sed -e "1,/^$/d" raw >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cleanup commit messages (strip option)' '
|
|
|
|
git reset --hard c1 &&
|
|
|
|
test_write_lines "" "# text" "sample" "" >text &&
|
|
|
|
echo sample >expect &&
|
|
|
|
git merge --cleanup=strip -F text c2 &&
|
|
|
|
git cat-file commit HEAD >raw &&
|
|
|
|
sed -e "1,/^$/d" raw >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2008-06-27 16:22:07 +00:00
|
|
|
test_done
|