cbc75a12f0
This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t3[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>
82 lines
1.5 KiB
Bash
Executable File
82 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test cherry-picking (and reverting) a root commit'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
echo first > file1 &&
|
|
git add file1 &&
|
|
test_tick &&
|
|
git commit -m "first" &&
|
|
|
|
git symbolic-ref HEAD refs/heads/second &&
|
|
rm .git/index file1 &&
|
|
echo second > file2 &&
|
|
git add file2 &&
|
|
test_tick &&
|
|
git commit -m "second" &&
|
|
|
|
git symbolic-ref HEAD refs/heads/third &&
|
|
rm .git/index file2 &&
|
|
echo third > file3 &&
|
|
git add file3 &&
|
|
test_tick &&
|
|
git commit -m "third"
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a root commit' '
|
|
|
|
git checkout second^0 &&
|
|
git cherry-pick main &&
|
|
echo first >expect &&
|
|
test_cmp expect file1
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a root commit' '
|
|
|
|
git revert main &&
|
|
test_path_is_missing file1
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a root commit with an external strategy' '
|
|
|
|
git cherry-pick --strategy=resolve main &&
|
|
echo first >expect &&
|
|
test_cmp expect file1
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a root commit with an external strategy' '
|
|
|
|
git revert --strategy=resolve main &&
|
|
test_path_is_missing file1
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick two root commits' '
|
|
|
|
echo first >expect.file1 &&
|
|
echo second >expect.file2 &&
|
|
echo third >expect.file3 &&
|
|
|
|
git checkout second^0 &&
|
|
git cherry-pick main third &&
|
|
|
|
test_cmp expect.file1 file1 &&
|
|
test_cmp expect.file2 file2 &&
|
|
test_cmp expect.file3 file3 &&
|
|
git rev-parse --verify HEAD^^ &&
|
|
test_must_fail git rev-parse --verify HEAD^^^
|
|
|
|
'
|
|
|
|
test_done
|