You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
1.9 KiB
69 lines
1.9 KiB
#!/bin/sh |
|
|
|
test_description='git merge --signoff |
|
|
|
This test runs git merge --signoff and makes sure that it works. |
|
' |
|
|
|
. ./test-lib.sh |
|
|
|
# Setup test files |
|
test_setup() { |
|
# Expected commit message after merge --signoff |
|
cat >expected-signed <<EOF && |
|
Merge branch 'master' into other-branch |
|
|
|
Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") |
|
EOF |
|
|
|
# Expected commit message after merge without --signoff (or with --no-signoff) |
|
cat >expected-unsigned <<EOF && |
|
Merge branch 'master' into other-branch |
|
EOF |
|
|
|
# Initial commit and feature branch to merge master into it. |
|
git commit --allow-empty -m "Initial empty commit" && |
|
git checkout -b other-branch && |
|
test_commit other-branch file1 1 |
|
} |
|
|
|
# Setup repository, files & feature branch |
|
# This step must be run if You want to test 2,3 or 4 |
|
# Order of 2,3,4 is not important, but 1 must be run before |
|
# For example `-r 1,4` or `-r 1,4,2 -v` etc |
|
# But not `-r 2` or `-r 4,3,2,1` |
|
test_expect_success 'setup' ' |
|
test_setup |
|
' |
|
|
|
# Test with --signoff flag |
|
test_expect_success 'git merge --signoff adds a sign-off line' ' |
|
git checkout master && |
|
test_commit master-branch-2 file2 2 && |
|
git checkout other-branch && |
|
git merge master --signoff --no-edit && |
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && |
|
test_cmp expected-signed actual |
|
' |
|
|
|
# Test without --signoff flag |
|
test_expect_success 'git merge does not add a sign-off line' ' |
|
git checkout master && |
|
test_commit master-branch-3 file3 3 && |
|
git checkout other-branch && |
|
git merge master --no-edit && |
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && |
|
test_cmp expected-unsigned actual |
|
' |
|
|
|
# Test for --no-signoff flag |
|
test_expect_success 'git merge --no-signoff flag cancels --signoff flag' ' |
|
git checkout master && |
|
test_commit master-branch-4 file4 4 && |
|
git checkout other-branch && |
|
git merge master --no-edit --signoff --no-signoff && |
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && |
|
test_cmp expected-unsigned actual |
|
' |
|
|
|
test_done
|
|
|