From 96cfa94e68cfbe9942e230ae18b35eaf1ca30f99 Mon Sep 17 00:00:00 2001 From: Isabella Stephens Date: Fri, 15 Jun 2018 16:29:27 +1000 Subject: blame: prevent error if range ends past end of file If the -L option is used to specify a line range in git blame, and the end of the range is past the end of the file, git will fail with a fatal error. This commit prevents such behavior - instead we display the blame for existing lines within the specified range. Tests are amended accordingly. This commit also fixes two corner cases. Blaming -L n,-(n+1) now blames the first n lines of a file rather than from n to the end of the file. Blaming -L ,-n will be treated as -L 1,-n and blame the first line of the file, rather than blaming the whole file. Signed-off-by: Isabella Stephens Signed-off-by: Junio C Hamano --- line-range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'line-range.c') diff --git a/line-range.c b/line-range.c index 323399d16c..232c3909ec 100644 --- a/line-range.c +++ b/line-range.c @@ -47,7 +47,7 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line, else if (!num) *ret = begin; else - *ret = begin + num; + *ret = begin + num > 0 ? begin + num : 1; return term; } return spec; -- cgit v1.2.3