On Thu, Apr 16, 2015 at 5:45 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Matthieu Moy <matthieu....@imag.fr> writes:
>
>> The old message did not mention the :regex:file form.
>>
>> To avoid overly long lines, split the message into two lines (in case
>> item->string is long, it will be the only part truncated in a narrow
>> terminal).
>>
>> Signed-off-by: Matthieu Moy <matthieu....@imag.fr>
>> ---
>> line-log.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/line-log.c b/line-log.c
>> index a490efe..e725248 100644
>> --- a/line-log.c
>> +++ b/line-log.c
>> @@ -575,7 +575,8 @@ parse_lines(struct commit *commit, const char *prefix,
>> struct string_list *args)
>>
>> name_part = skip_range_arg(item->string);
>> if (!name_part || *name_part != ':' || !name_part[1])
>> - die("-L argument '%s' not of the form start,end:file",
>> + die("invalid -L argument '%s'.\n"
>> + "It should be of the form start,end:file or
>> :regex:file.",
>> item->string);
>> range_part = xstrndup(item->string, name_part - item->string);
>> name_part++;
>
> You forgot to update tests to match their expectations? 4211.20
> wants to see 'argument.*not of the form', it seems.
An alternate wording might be:
"-L argument not 'start,end:file' or ':regex:file': %s"
This can still wrap onscreen but the important information (the two
forms accepted by -L) is at the head of the error message, and the
variable (user-supplied) bit is at the end after the colon, in typical
error message form.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
