mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
f29b5e06b3
Instead of saying "Finished one cherry-pick." or "Finished one revert.", we now say "Finished cherry-pick of commit <abbreviated sha1>." or "Finished revert of commit <abbreviated sha1>." which is more informative, especially when cherry-picking or reverting many commits. In case of failure the message is now "Automatic cherry-pick of commit <abbreviated sha1> failed." instead of "Automatic cherry-pick failed." Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
129 lines
3.5 KiB
Bash
Executable file
129 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test cherry-picking many commits'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo first > file1 &&
|
|
git add file1 &&
|
|
test_tick &&
|
|
git commit -m "first" &&
|
|
git tag first &&
|
|
|
|
git checkout -b other &&
|
|
for val in second third fourth
|
|
do
|
|
echo $val >> file1 &&
|
|
git add file1 &&
|
|
test_tick &&
|
|
git commit -m "$val" &&
|
|
git tag $val
|
|
done
|
|
'
|
|
|
|
test_expect_success 'cherry-pick first..fourth works' '
|
|
cat <<-EOF >expected &&
|
|
Finished cherry-pick of commit $(git rev-parse --short second).
|
|
Finished cherry-pick of commit $(git rev-parse --short third).
|
|
Finished cherry-pick of commit $(git rev-parse --short fourth).
|
|
EOF
|
|
|
|
git checkout -f master &&
|
|
git reset --hard first &&
|
|
test_tick &&
|
|
git cherry-pick first..fourth 2>actual &&
|
|
git diff --quiet other &&
|
|
git diff --quiet HEAD other &&
|
|
test_cmp expected actual &&
|
|
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
|
'
|
|
|
|
test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
|
|
cat <<-EOF >expected &&
|
|
Finished cherry-pick of commit $(git rev-parse --short second) with strategy resolve.
|
|
Finished cherry-pick of commit $(git rev-parse --short third) with strategy resolve.
|
|
Finished cherry-pick of commit $(git rev-parse --short fourth) with strategy resolve.
|
|
EOF
|
|
|
|
git checkout -f master &&
|
|
git reset --hard first &&
|
|
test_tick &&
|
|
git cherry-pick --strategy resolve first..fourth 2>actual &&
|
|
git diff --quiet other &&
|
|
git diff --quiet HEAD other &&
|
|
test_cmp expected actual &&
|
|
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
|
'
|
|
|
|
test_expect_success 'cherry-pick --ff first..fourth works' '
|
|
git checkout -f master &&
|
|
git reset --hard first &&
|
|
test_tick &&
|
|
git cherry-pick --ff first..fourth &&
|
|
git diff --quiet other &&
|
|
git diff --quiet HEAD other &&
|
|
test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify fourth)"
|
|
'
|
|
|
|
test_expect_success 'cherry-pick -n first..fourth works' '
|
|
git checkout -f master &&
|
|
git reset --hard first &&
|
|
test_tick &&
|
|
git cherry-pick -n first..fourth &&
|
|
git diff --quiet other &&
|
|
git diff --cached --quiet other &&
|
|
git diff --quiet HEAD first
|
|
'
|
|
|
|
test_expect_success 'revert first..fourth works' '
|
|
git checkout -f master &&
|
|
git reset --hard fourth &&
|
|
test_tick &&
|
|
git revert first..fourth &&
|
|
git diff --quiet first &&
|
|
git diff --cached --quiet first &&
|
|
git diff --quiet HEAD first
|
|
'
|
|
|
|
test_expect_success 'revert ^first fourth works' '
|
|
git checkout -f master &&
|
|
git reset --hard fourth &&
|
|
test_tick &&
|
|
git revert ^first fourth &&
|
|
git diff --quiet first &&
|
|
git diff --cached --quiet first &&
|
|
git diff --quiet HEAD first
|
|
'
|
|
|
|
test_expect_success 'revert fourth fourth~1 fourth~2 works' '
|
|
git checkout -f master &&
|
|
git reset --hard fourth &&
|
|
test_tick &&
|
|
git revert fourth fourth~1 fourth~2 &&
|
|
git diff --quiet first &&
|
|
git diff --cached --quiet first &&
|
|
git diff --quiet HEAD first
|
|
'
|
|
|
|
test_expect_success 'cherry-pick -3 fourth works' '
|
|
git checkout -f master &&
|
|
git reset --hard first &&
|
|
test_tick &&
|
|
git cherry-pick -3 fourth &&
|
|
git diff --quiet other &&
|
|
git diff --quiet HEAD other &&
|
|
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
|
'
|
|
|
|
test_expect_success 'cherry-pick --stdin works' '
|
|
git checkout -f master &&
|
|
git reset --hard first &&
|
|
test_tick &&
|
|
git rev-list --reverse first..fourth | git cherry-pick --stdin &&
|
|
git diff --quiet other &&
|
|
git diff --quiet HEAD other &&
|
|
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
|
'
|
|
|
|
test_done
|