| Message ID | ccfe8ae38301b6ee1b0924fbf00eb5d20242ea5d.1544764226.git.sorganov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Allow 'cherry-pick -m 1' for non-merge commits | expand |
On Fri, Dec 14, 2018 at 07:53:51AM +0300, Sergey Organov wrote: > Signed-off-by: Sergey Organov <sorganov@gmail.com> > --- > t/t3502-cherry-pick-merge.sh | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh > index b160271..3259bd5 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 You need disambiguaion here, otherwise this test fails on case-insensitive file systems: ++git diff --exit-code a fatal: ambiguous argument 'a': both revision and filename Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' error: last command exited with $?=128 not ok 8 - revert explicit first parent of a non-merge > > ' > > -- > 2.10.0.1.g57b01a3 >
SZEDER Gábor <szeder.dev@gmail.com> writes: > On Fri, Dec 14, 2018 at 07:53:51AM +0300, Sergey Organov wrote: >> Signed-off-by: Sergey Organov <sorganov@gmail.com> [...] >> >> @@ -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 > > You need disambiguaion here, otherwise this test fails on > case-insensitive file systems: > > ++git diff --exit-code a > fatal: ambiguous argument 'a': both revision and filename > Use '--' to separate paths from revisions, like this: > 'git <command> [<revision>...] -- [<file>...]' > error: last command exited with $?=128 > not ok 8 - revert explicit first parent of a non-merge Good catch, -- thanks a lot! -- Sergey
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index b160271..3259bd5 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 '
Signed-off-by: Sergey Organov <sorganov@gmail.com> --- t/t3502-cherry-pick-merge.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)