From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jul 2013 14:53:25 +0000 (-0700)
Subject: t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)
X-Git-Tag: v1.8.4-rc0~13^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3a486c47d920efc183645766d762fd697c42088?ds=inline;hp=--cc

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

Wnen I rewrote "cat b.c | wc -l" into "wc -l <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 <gitster@pobox.com>
---

d3a486c47d920efc183645766d762fd697c42088
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 00a850d611..7665d6785c 100755
--- 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
 '