Sync with 2.3.8

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-05-11 14:39:28 -07:00
parent 3d4a3ffe64 9a3d637541
commit c99fec6e35
12 changed files with 149 additions and 25 deletions
--- 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++;