git-commit-vandalism/t/t3508-cherry-pick-many-commits.sh
Christian Couder 6bc83cdd0b t3508: add check_head_differs_from() helper function and use it
In a test like:

test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"

the --verify does not accomplish much, since the exit status of
git rev-parse is not propagated to test. So it is more robust to
define and use the helper functions check_head_differs_from() and
check_head_equals() as done by this patch.

Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-07-23 15:07:39 -07:00

142 lines
3.5 KiB
Bash
Executable File

#!/bin/sh
test_description='test cherry-picking many commits'
. ./test-lib.sh
check_head_differs_from() {
head=$(git rev-parse --verify HEAD) &&
arg=$(git rev-parse --verify "$1") &&
test "$head" != "$arg"
}
check_head_equals() {
head=$(git rev-parse --verify HEAD) &&
arg=$(git rev-parse --verify "$1") &&
test "$head" = "$arg"
}
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 &&
check_head_differs_from 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 &&
check_head_differs_from 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 &&
check_head_equals 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 &&
check_head_differs_from 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 &&
check_head_differs_from fourth
'
test_done