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

sunshineco · gitster · commit 5d57cac6ae7c · 2013-08-05T11:54:32.000-07:00
Empty ranges -L,+0 and -L,-0 are nonsensical in the context of blame yet
they are accepted (in fact, both are interpreted as -L1,Y where Y is
end-of-file). Report them as invalid.

Signed-off-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/line-range.c b/line-range.c
@@ -21,7 +21,7 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line,
 	 * for 20 lines, or "-L <something>,-5" for 5 lines ending at
 	 * <something>.
 	 */
-	if (1 < begin && (spec[0] == '+' || spec[0] == '-')) {
+	if (1 <= begin && (spec[0] == '+' || spec[0] == '-')) {
 		num = strtol(spec + 1, &term, 10);
 		if (term != spec + 1) {
 			if (!ret)
diff --git 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 ,+0' '
+test_expect_success 'blame -L ,+0' '
 	test_must_fail $PROG -L,+0 file
 '
 
@@ -201,7 +201,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 ,-0' '
+test_expect_success 'blame -L ,-0' '
 	test_must_fail $PROG -L,-0 file
 '
 

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ test_expect_success 'blame -L Y,X (undocumented)' '`
`185`	`185`	`check_count -L6,3 B 1 B1 1 B2 1 D 1`
`186`	`186`	`'`
`187`	`187`
`188`		`-test_expect_failure 'blame -L ,+0' '`
	`188`	`+test_expect_success 'blame -L ,+0' '`
`189`	`189`	`test_must_fail $PROG -L,+0 file`
`190`	`190`	`'`
`191`	`191`
`@@ -201,7 +201,7 @@ test_expect_success 'blame -L X,+N' '`
`201`	`201`	`check_count -L3,+4 B 1 B1 1 B2 1 D 1`
`202`	`202`	`'`
`203`	`203`
`204`		`-test_expect_failure 'blame -L ,-0' '`
	`204`	`+test_expect_success 'blame -L ,-0' '`
`205`	`205`	`test_must_fail $PROG -L,-0 file`
`206`	`206`	`'`
`207`	`207`