diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-11 15:24:01 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-11 20:32:20 +0400 |
commit | 3fb0459bc89bebb07e0603ce3ce92dbbc8a39ea4 (patch) | |
tree | b8e4ab3fc39f64973168b4656c57d2874e1abdaf /t/t6042-merge-rename-corner-cases.sh | |
parent | e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d (diff) |
tests: modernise style: more uses of test_line_count
Prefer:
test_line_count <OP> COUNT FILE
over:
test $(wc -l <FILE) <OP> COUNT
(or similar usages) in several tests.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6042-merge-rename-corner-cases.sh')
-rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 32591f9413..466fa3804b 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -104,7 +104,7 @@ test_expect_failure 'conflict caused if rename not detected' ' test 0 -eq $(git ls-files -u | wc -l) && test 0 -eq $(git ls-files -o | wc -l) && - test 6 -eq $(wc -l < c) && + test_line_count = 6 c && test $(git rev-parse HEAD:a) = $(git rev-parse B:a) && test $(git rev-parse HEAD:b) = $(git rev-parse A:b) ' |