mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
b16a991c1b
The cherry-pick and revert commands use OPT_INTEGER() to parse --mainline. The stock parser is smart enough to reject non-numeric nonsense, but it doesn't know that parent counting starts at 1. Worse, the value "0" is indistinguishable from the unset case, so a user who assumes the counting is 0-based will get a confusing message: $ git cherry-pick -m 0 $merge error: commit ... is a merge but no -m option was given. Let's use a custom callback that enforces our range. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
132 lines
2.4 KiB
Bash
Executable file
132 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='cherry picking and reverting a merge
|
|
|
|
b---c
|
|
/ /
|
|
initial---a
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
>A &&
|
|
>B &&
|
|
git add A B &&
|
|
git commit -m "Initial" &&
|
|
git tag initial &&
|
|
git branch side &&
|
|
echo new line >A &&
|
|
git commit -m "add line to A" A &&
|
|
git tag a &&
|
|
git checkout side &&
|
|
echo new line >B &&
|
|
git commit -m "add line to B" B &&
|
|
git tag b &&
|
|
git checkout master &&
|
|
git merge side &&
|
|
git tag c
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick -m complains of bogus numbers' '
|
|
# expect 129 here to distinguish between cases where
|
|
# there was nothing to cherry-pick
|
|
test_expect_code 129 git cherry-pick -m &&
|
|
test_expect_code 129 git cherry-pick -m foo b &&
|
|
test_expect_code 129 git cherry-pick -m -1 b &&
|
|
test_expect_code 129 git cherry-pick -m 0 b
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a non-merge with -m should fail' '
|
|
|
|
git reset --hard &&
|
|
git checkout a^0 &&
|
|
test_expect_code 128 git cherry-pick -m 1 b &&
|
|
git diff --exit-code a --
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry pick a merge without -m should fail' '
|
|
|
|
git reset --hard &&
|
|
git checkout a^0 &&
|
|
test_must_fail git cherry-pick c &&
|
|
git diff --exit-code a --
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry pick a merge (1)' '
|
|
|
|
git reset --hard &&
|
|
git checkout a^0 &&
|
|
git cherry-pick -m 1 c &&
|
|
git diff --exit-code c
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry pick a merge (2)' '
|
|
|
|
git reset --hard &&
|
|
git checkout b^0 &&
|
|
git cherry-pick -m 2 c &&
|
|
git diff --exit-code c
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry pick a merge relative to nonexistent parent should fail' '
|
|
|
|
git reset --hard &&
|
|
git checkout b^0 &&
|
|
test_must_fail git cherry-pick -m 3 c
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a non-merge with -m should fail' '
|
|
|
|
git reset --hard &&
|
|
git checkout c^0 &&
|
|
test_must_fail git revert -m 1 b &&
|
|
git diff --exit-code c
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a merge without -m should fail' '
|
|
|
|
git reset --hard &&
|
|
git checkout c^0 &&
|
|
test_must_fail git revert c &&
|
|
git diff --exit-code c
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a merge (1)' '
|
|
|
|
git reset --hard &&
|
|
git checkout c^0 &&
|
|
git revert -m 1 c &&
|
|
git diff --exit-code a --
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a merge (2)' '
|
|
|
|
git reset --hard &&
|
|
git checkout c^0 &&
|
|
git revert -m 2 c &&
|
|
git diff --exit-code b --
|
|
|
|
'
|
|
|
|
test_expect_success 'revert a merge relative to nonexistent parent should fail' '
|
|
|
|
git reset --hard &&
|
|
git checkout c^0 &&
|
|
test_must_fail git revert -m 3 c &&
|
|
git diff --exit-code c
|
|
|
|
'
|
|
|
|
test_done
|