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>

diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh
index b1602718f85468d17faa1cc0d7ae8854ac2f5407..8b635a196d5cc57016520466b92b5f439b217a9d 100755 (executable)
--- 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_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 &&
 
        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 &&
 
        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 --

 
 '
 
 
 '