admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blame: reject empty ranges -LX,+0 and -LX,-0

Browse Source 
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>
This commit is contained in:
Eric Sunshine
2013-07-31 04:15:43 -04:00
committed by Junio C Hamano
parent dedb9129d4
commit abba35395f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
line-range.c
View File

@@ -26,6 +26,8 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line,
if (term != spec + 1) { if (term != spec + 1) {
if (!ret) if (!ret)
return term; return term;
if (num == 0)
die("-L invalid empty range");
if (spec[0] == '-') if (spec[0] == '-')
num = 0 - num; num = 0 - num;
if (0 < num) if (0 < num)

4
t/annotate-tests.sh
View File

@@ -185,7 +185,7 @@ test_expect_success 'blame -L Y,X (undocumented)' '
check_count -L6,3 B 1 B1 1 B2 1 D 1 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 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 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 test_must_fail $PROG -L1,-0 file
' '