diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2018-12-14 07:53:51 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-07 08:44:37 -0800 |
| commit | 4d67b4e4740895ddc5b8bd4f205e159999c1b974 (patch) | |
| tree | dcecc1e9b871bf274d9719d4c071dae37c383463 | |
| parent | cherry-pick: do not error on non-merge commits when '-m 1' is specified (diff) | |
| download | tgif-4d67b4e4740895ddc5b8bd4f205e159999c1b974.tar.xz | |
t3502: validate '-m 1' argument is now accepted for non-merge commits
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3502-cherry-pick-merge.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index b1602718f8..8b635a196d 100755 --- a/t/t3502-cherry-pick-merge.sh +++ b/t/t3502-cherry-pick-merge.sh @@ -40,12 +40,12 @@ test_expect_success 'cherry-pick -m complains of bogus numbers' ' test_expect_code 129 git cherry-pick -m 0 b ' -test_expect_success 'cherry-pick a non-merge with -m should fail' ' +test_expect_success 'cherry-pick explicit first parent of a non-merge' ' git reset --hard && git checkout a^0 && - test_expect_code 128 git cherry-pick -m 1 b && - git diff --exit-code a -- + git cherry-pick -m 1 b && + git diff --exit-code c -- ' @@ -84,12 +84,12 @@ test_expect_success 'cherry pick a merge relative to nonexistent parent should f ' -test_expect_success 'revert a non-merge with -m should fail' ' +test_expect_success 'revert explicit first parent of a non-merge' ' git reset --hard && git checkout c^0 && - test_must_fail git revert -m 1 b && - git diff --exit-code c + git revert -m 1 b && + git diff --exit-code a -- ' |