aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-24 07:53:25 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-24 07:53:25 -0700
commitd3a486c47d920efc183645766d762fd697c42088 (patch)
tree80af05c5f216f71733bd824a4b0696519e28b9ac
parentefc5e5ef8e467ebbdd4f93c23f2269b907fcdc15 (diff)
downloadgit-d3a486c47d920efc183645766d762fd697c42088.tar.gz
git-d3a486c47d920efc183645766d762fd697c42088.tar.xz
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>
-rwxr-xr-xt/t4211-line-log.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 00a850d61..7665d6785 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
'