diff options
| -rw-r--r-- | line-log.c | 4 | ||||
| -rwxr-xr-x | t/t4211-line-log.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/line-log.c b/line-log.c index c2d01dccc2..1c3ac8dccd 100644 --- a/line-log.c +++ b/line-log.c @@ -594,13 +594,13 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args) lines, &begin, &end, full_name)) die("malformed -L argument '%s'", range_part); + if (lines < end || ((lines || begin) && lines < begin)) + die("file %s has only %lu lines", name_part, lines); if (begin < 1) begin = 1; if (end < 1) end = lines; begin--; - if (lines < end || lines < begin) - die("file %s has only %ld lines", name_part, lines); line_log_data_insert(&ranges, full_name, begin, end); free_filespec(spec); diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 769ac686c3..b01b3ddebb 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -69,7 +69,7 @@ test_expect_success '-L X (X == nlines)' ' git log -L $n:b.c ' -test_expect_failure '-L X (X == nlines + 1)' ' +test_expect_success '-L X (X == nlines + 1)' ' n=$(expr $(wc -l <b.c) + 1) && test_must_fail git log -L $n:b.c ' |