diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-04-20 14:09:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-20 11:06:10 -0700 |
| commit | 0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (patch) | |
| tree | b16adab6818608f864d94ed20487b5c81a9c86c0 | |
| parent | d349e0ee60e1bad1cf49245e402ca086ddb5ff80 (diff) | |
| download | git-0269f968b7effea8a4f61f1fb0ac7e9386a9d90c.tar.gz | |
log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regex
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.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | line-log.c | 2 | ||||
| -rwxr-xr-x | t/t4211-line-log.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/line-log.c b/line-log.c index b7864ad586..1a6bc5921b 100644 --- a/line-log.c +++ b/line-log.c @@ -575,7 +575,7 @@ 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("-L argument not 'start,end:file' or ':funcname:file': %s", item->string); range_part = xstrndup(item->string, name_part - item->string); name_part++; diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 0901b30982..4451127eb2 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -54,14 +54,14 @@ canned_test "-L 4:a.c -L 8,12:a.c simple" multiple-superset canned_test "-L 8,12:a.c -L 4:a.c simple" multiple-superset test_bad_opts "-L" "switch.*requires a value" -test_bad_opts "-L b.c" "argument.*not of the form" -test_bad_opts "-L 1:" "argument.*not of the form" +test_bad_opts "-L b.c" "argument not .start,end:file" +test_bad_opts "-L 1:" "argument not .start,end:file" test_bad_opts "-L 1:nonexistent" "There is no path" test_bad_opts "-L 1:simple" "There is no path" -test_bad_opts "-L '/foo:b.c'" "argument.*not of the form" +test_bad_opts "-L '/foo:b.c'" "argument not .start,end:file" test_bad_opts "-L 1000:b.c" "has only.*lines" test_bad_opts "-L 1,1000:b.c" "has only.*lines" -test_bad_opts "-L :b.c" "argument.*not of the form" +test_bad_opts "-L :b.c" "argument not .start,end:file" test_bad_opts "-L :foo:b.c" "no match" test_expect_success '-L X (X == nlines)' ' |