Re: [PATCH v2 3/4] t3502: validate '-m 1' argument is now accepted for non-merge commits
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>
Show 24 quoted lines
>>
>> @@ -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
Sergey Organov <sorganov@gmail.com>