From: Eric Sunshine Date: Wed, 31 Jul 2013 08:15:43 GMT Subject: [PATCH 09/11] blame: reject empty ranges -LX,+0 and -LX,-0 Message-ID: <1375258545-42240-10-git-send-email-sunshine@sunshineco.com> In-Reply-To: <1375258545-42240-1-git-send-email-sunshine@sunshineco.com> Empty ranges -LX,+0 and -LX,-0 are nonsensical in the context of blame yet they are accepted (in fact, both are interpreted as -LX,+2). Report them as invalid. Signed-off-by: Eric Sunshine --- line-range.c | 2 ++ t/annotate-tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/line-range.c b/line-range.c index 3942475..a816951 100644 --- a/line-range.c +++ b/line-range.c @@ -26,6 +26,8 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line, if (term != spec + 1) { if (!ret) return term; + if (num == 0) + die("-L invalid empty range"); if (spec[0] == '-') num = 0 - num; if (0 < num) diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 0f80cba..01d50c5 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -185,7 +185,7 @@ test_expect_success 'blame -L Y,X (undocumented)' ' check_count -L6,3 B 1 B1 1 B2 1 D 1 ' -test_expect_failure 'blame -L X,+0' ' +test_expect_success 'blame -L X,+0' ' test_must_fail $PROG -L1,+0 file ' @@ -197,7 +197,7 @@ test_expect_success 'blame -L X,+N' ' check_count -L3,+4 B 1 B1 1 B2 1 D 1 ' -test_expect_failure 'blame -L X,-0' ' +test_expect_success 'blame -L X,-0' ' test_must_fail $PROG -L1,-0 file ' -- 1.8.3.4.1120.gc240c48