mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
7b53b92fdb
"git cherry-pick foo" has always reported success with "Finished one cherry-pick" but "cherry-pick --strategy" does not print anything. So move the code to write that message from do_recursive_merge() to do_cherry_pick() so other strategies can share it. This patch also refactors the code that prints a message like "Automatic cherry-pick failed. <help message>". This code was duplicated in both do_recursive_merge() and do_pick_commit(). To do that, now do_recursive_merge() returns an int to signal success or failure. And in case of failure we just return 1 from do_pick_commit() instead of doing "exit(1)" from either do_recursive_merge() or do_pick_commit(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
130 lines
3.2 KiB
Bash
Executable file
130 lines
3.2 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 one cherry-pick.
|
|
Finished one cherry-pick.
|
|
Finished one cherry-pick.
|
|
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 one cherry-pick with strategy resolve.
|
|
Finished one cherry-pick with strategy resolve.
|
|
Finished one cherry-pick 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
|