mirror of
https://github.com/git/git.git
synced 2024-05-23 18:26:08 +02:00
1e2ae142c0
Excluding t7817, which is added in an unrelated patch series at the time of writing, this adjusts t7[5-9]*. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t7[5-9]*.sh) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
73 lines
2.0 KiB
Bash
Executable File
73 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git merge --signoff
|
|
|
|
This test runs git merge --signoff and makes sure that it works.
|
|
'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
# Setup test files
|
|
test_setup() {
|
|
# Expected commit message after merge --signoff
|
|
cat >expected-signed <<EOF &&
|
|
Merge branch 'main' 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 'main' into other-branch
|
|
EOF
|
|
|
|
# Initial commit and feature branch to merge main 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 main &&
|
|
test_commit main-branch-2 file2 2 &&
|
|
git checkout other-branch &&
|
|
git merge main --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 main &&
|
|
test_commit main-branch-3 file3 3 &&
|
|
git checkout other-branch &&
|
|
git merge main --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 main &&
|
|
test_commit main-branch-4 file4 4 &&
|
|
git checkout other-branch &&
|
|
git merge main --no-edit --signoff --no-signoff &&
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
|
|
test_cmp expected-unsigned actual
|
|
'
|
|
|
|
test_done
|