diff options
| author | Isabella Stephens <istephens@atlassian.com> | 2018-06-15 09:29:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-15 20:29:13 +0300 |
| commit | 96cfa94e68cfbe9942e230ae18b35eaf1ca30f99 (patch) | |
| tree | a1e806e0b896c3f60c83cecb987c4e8425b6e6e6 /line-range.c | |
| parent | fc54c1af3ec09bab8b8ea09768c2da4069b7f53e (diff) | |
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 <istephens@atlassian.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'line-range.c')
| -rw-r--r-- | line-range.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |