diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
commit | c8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch) | |
tree | 24e09d9f84dec336720cf393e156089ca2835791 /t/t3505-cherry-pick-empty.sh | |
parent | Initial commit. (diff) | |
download | git-17a789943131483bc454986d1be6da6caaabce8c.tar.xz git-17a789943131483bc454986d1be6da6caaabce8c.zip |
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 't/t3505-cherry-pick-empty.sh')
-rwxr-xr-x | t/t3505-cherry-pick-empty.sh | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh new file mode 100755 index 0000000..eba3c38 --- /dev/null +++ b/t/t3505-cherry-pick-empty.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +test_description='test cherry-picking an empty 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 checkout -b empty-message-branch && + echo third >> file1 && + git add file1 && + test_tick && + git commit --allow-empty-message -m "" && + + git checkout main && + git checkout -b empty-change-branch && + test_tick && + git commit --allow-empty -m "empty" + +' + +test_expect_success 'cherry-pick an empty commit' ' + git checkout main && + test_expect_code 1 git cherry-pick empty-change-branch +' + +test_expect_success 'index lockfile was removed' ' + test ! -f .git/index.lock +' + +test_expect_success 'cherry-pick a commit with an empty message' ' + test_when_finished "git reset --hard empty-message-branch~1" && + git checkout main && + git cherry-pick empty-message-branch +' + +test_expect_success 'index lockfile was removed' ' + test ! -f .git/index.lock +' + +test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' ' + git checkout -f main && + git cherry-pick --allow-empty-message empty-message-branch +' + +test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' ' + git checkout main && + echo fourth >>file2 && + git add file2 && + git commit -m "fourth" && + test_must_fail git cherry-pick empty-change-branch +' + +test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' ' + git checkout main && + git cherry-pick --allow-empty empty-change-branch +' + +test_expect_success 'cherry pick with --keep-redundant-commits' ' + git checkout main && + git cherry-pick --keep-redundant-commits HEAD^ +' + +test_expect_success 'cherry-pick a commit that becomes no-op (prep)' ' + git checkout main && + git branch fork && + echo foo >file2 && + git add file2 && + test_tick && + git commit -m "add file2 on main" && + + git checkout fork && + echo foo >file2 && + git add file2 && + test_tick && + git commit -m "add file2 on the side" +' + +test_expect_success 'cherry-pick a no-op without --keep-redundant' ' + git reset --hard && + git checkout fork^0 && + test_must_fail git cherry-pick main +' + +test_expect_success 'cherry-pick a no-op with --keep-redundant' ' + git reset --hard && + git checkout fork^0 && + git cherry-pick --keep-redundant-commits main && + git show -s --format=%s >actual && + echo "add file2 on main" >expect && + test_cmp expect actual +' + +test_done |