Merge branch 'sg/test-must-be-empty'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2018 21:33:43 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2018 21:33:43 +0000 (14:33 -0700)
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'

32 files changed:
1  2 
t/t0000-basic.sh
t/t0001-init.sh
t/t0003-attributes.sh
t/t0090-cache-tree.sh
t/t1300-config.sh
t/t1411-reflog-show.sh
t/t1450-fsck.sh
t/t1700-split-index.sh
t/t3210-pack-refs.sh
t/t3301-notes.sh
t/t3310-notes-merge-manual-resolve.sh
t/t3404-rebase-interactive.sh
t/t3600-rm.sh
t/t4015-diff-whitespace.sh
t/t4041-diff-submodule-option.sh
t/t4060-diff-submodule-option-diff-format.sh
t/t4150-am.sh
t/t4211-line-log.sh
t/t5401-update-hooks.sh
t/t5500-fetch-pack.sh
t/t5526-fetch-submodules.sh
t/t5541-http-push-smart.sh
t/t5570-git-daemon.sh
t/t7001-mv.sh
t/t7004-tag.sh
t/t7201-co.sh
t/t7400-submodule-basic.sh
t/t7501-commit.sh
t/t7610-mergetool.sh
t/t7810-grep.sh
t/t9200-git-cvsexportcommit.sh
t/t9903-bash-prompt.sh

Simple merge
diff --cc t/t0001-init.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/t1450-fsck.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/t3600-rm.sh
Simple merge
Simple merge
Simple merge
diff --cc t/t4150-am.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/t7001-mv.sh
Simple merge
diff --cc t/t7004-tag.sh
Simple merge
diff --cc t/t7201-co.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/t7810-grep.sh
@@@ -954,9 -932,10 +947,9 @@@ test_expect_success 'grep from a subdir
  test_expect_success 'grep from a subdirectory to search wider area (2)' '
        mkdir -p s &&
        (
 -              cd s || exit 1
 -              ( git grep xxyyzz .. >out ; echo $? >status )
 -              test_must_be_empty out &&
 -              test 1 = $(cat status)
 +              cd s &&
 +              test_expect_code 1 git grep xxyyzz .. >out &&
-               ! test -s out
++              test_must_be_empty out
        )
  '
  
Simple merge
Simple merge