diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2013-07-31 04:15:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 11:54:32 -0700 |
| commit | abba35395f859600cca1c04f1eab633963a8646e (patch) | |
| tree | 2baa03bfc8546e443a98702cf9c57831bc46f95c | |
| parent | dedb9129d472671c608c7adab5bc5e773e651336 (diff) | |
| download | git-abba35395f859600cca1c04f1eab633963a8646e.tar.gz | |
blame: reject empty ranges -LX,+0 and -LX,-0
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 <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | line-range.c | 2 | ||||
| -rw-r--r-- | t/annotate-tests.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/line-range.c b/line-range.c index 3942475c2f..a816951e06 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 bbf3ee6892..cd9222b8fc 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 ' |