Merge branch 'sg/complete-decorate-full-not-long'

diff --git a/line-log.c b/line-log.c
index b43ac5869857903bd105546d9cf07fb2b2451d31..a5ed9e3642271afd69a0434876515b97aaceb657 100644 (file)
--- 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++;