t4211: fix incorrect rebase at f8395ed (range-set: satisfy non-empty ranges invariant)

gitster · gitster · commit d3a486c47d92 · 2013-07-24T07:53:25.000-07:00
Wnen I rewrote "cat b.c | wc -l" into "wc -l &lt;b.c" to squash in a
suggestion on the list to this series, I screwed up subsequent
rebase.  Fix it up.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
@@ -68,7 +68,6 @@ test_bad_opts "-L :foo:b.c" "no match"
 # thus to demonstrate this particular bug, the empty -L range must follow a
 # non-empty -L range.
 test_expect_success '-L {empty-range} (any -L)' '
-	n=$(expr $(cat b.c | wc -l) + 1) &&
 	n=$(expr $(wc -l <b.c) + 1) &&
 	git log -L1,1:b.c -L$n:b.c
 '

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ test_bad_opts "-L :foo:b.c" "no match"`
`68`	`68`	`# thus to demonstrate this particular bug, the empty -L range must follow a`
`69`	`69`	`# non-empty -L range.`
`70`	`70`	`test_expect_success '-L {empty-range} (any -L)' '`
`71`		`- n=$(expr $(cat b.c \| wc -l) + 1) &&`
`72`	`71`	`n=$(expr $(wc -l <b.c) + 1) &&`
`73`	`72`	`git log -L1,1:b.c -L$n:b.c`
`74`	`73`	`'`