X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3502-cherry-pick-merge.sh;h=e37547f41a21ebda150aad6797012c9df3742382;hb=b51ffa80f6e65fde91a667c4825eeeb4deb997f6;hp=0ab52da902c8d602e9c4d64660aa4a7e8e35544f;hpb=5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243;p=git.git diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index 0ab52da90..e37547f41 100755 --- a/t/t3502-cherry-pick-merge.sh +++ b/t/t3502-cherry-pick-merge.sh @@ -35,7 +35,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' ' git reset --hard && git checkout a^0 && - test_must_fail git cherry-pick -m 1 b && + test_expect_code 128 git cherry-pick -m 1 b && git diff --exit-code a -- '