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>
Eric Sunshine committed
Jul 31, 2013 at 04:15 UTC
abba35395f859600cca1c04f1eab633963a8646e
2 files changed
+4
-2
line-range.c
+2
@@ -26,6 +26,8 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line,
26
if (term != spec + 1) {
27
if (!ret)
28
return term;
29
+ if (num == 0)
30
+ die("-L invalid empty range");
31
if (spec[0] == '-')
32
num = 0 - num;
33
if (0 < num)
t/annotate-tests.sh
+2
-2
@@ -185,7 +185,7 @@ test_expect_success 'blame -L Y,X (undocumented)' '
185
check_count -L6,3 B 1 B1 1 B2 1 D 1
186
'
187
188
-test_expect_failure 'blame -L X,+0' '
188
+test_expect_success 'blame -L X,+0' '
189
test_must_fail $PROG -L1,+0 file
190
'
191
@@ -197,7 +197,7 @@ test_expect_success 'blame -L X,+N' '
197
check_count -L3,+4 B 1 B1 1 B2 1 D 1
198
'
199
200
-test_expect_failure 'blame -L X,-0' '
200
+test_expect_success 'blame -L X,-0' '
201
test_must_fail $PROG -L1,-0 file
202
'
203