summaryrefslogtreecommitdiff
path: root/line-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-05 21:00:36 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-05 21:00:36 -0700
commit67498507699641549094f0cbf8800f88176b50c9 (patch)
tree952672be724d1f36844131d1b73e2e148d6fd212 /line-log.c
parent64c9e027658124a29aeae47e43fa08aaff760f43 (diff)
parent0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (diff)
downloadgit-67498507699641549094f0cbf8800f88176b50c9.tar.gz
Merge branch 'mm/usage-log-l-can-take-regex'
Documentation fix. * mm/usage-log-l-can-take-regex: log -L: improve error message on malformed argument Documentation: change -L:<regex> to -L:<funcname>
Diffstat (limited to 'line-log.c')
-rw-r--r--line-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/line-log.c b/line-log.c
index b43ac58698..a5ed9e3642 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++;