summaryrefslogtreecommitdiff
path: root/t/t1700-split-index.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:43 (GMT)
commit986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a (patch)
tree4ef3f9805cfdbf3b4496cb720a94c138df034204 /t/t1700-split-index.sh
parentfc0df933c8fa09603a9e9798085ee07ca1a83f65 (diff)
parent1c5e94f459a0b7c23ef7e855441a65afdc4effab (diff)
downloadgit-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.zip
git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.gz
git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.bz2
Merge branch 'sg/test-must-be-empty'
Test fixes. * sg/test-must-be-empty: tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' tests: use 'test_must_be_empty' instead of 'test ! -s' tests: use 'test_must_be_empty' instead of '! test -s'
Diffstat (limited to 't/t1700-split-index.sh')
-rwxr-xr-xt/t1700-split-index.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 39133bc..b3b4d83 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -143,9 +143,7 @@ test_expect_success 'remove file not in base index' '
test_expect_success 'remove file in base index' '
git update-index --force-remove one &&
git ls-files --stage >ls-files.actual &&
- cat >ls-files.expect <<-EOF &&
- EOF
- test_cmp ls-files.expect ls-files.actual &&
+ test_must_be_empty ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF &&