diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-30 21:10:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-30 21:10:41 (GMT) |
| commit | 17a02998078923f2d62811326d130de991d1a95a (patch) | |
| tree | f33b6e5758233f3f7ae05fe0d8565323de381820 /t | |
| parent | 44a9cedb005b0b8be31dccd8e6ddf97074a01345 (diff) | |
| parent | 806e0aba2e5d976233703e6ff517af10329e4048 (diff) | |
| download | git-17a02998078923f2d62811326d130de991d1a95a.zip git-17a02998078923f2d62811326d130de991d1a95a.tar.gz git-17a02998078923f2d62811326d130de991d1a95a.tar.bz2 | |
Merge branch 'maint'
* maint:
contrib/thunderbird-patch-inline: do not require bash to run the script
t8001: check the exit status of the command being tested
strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead
Typos: t/README
Documentation/config.txt: make truth value of numbers more explicit
git-pack-objects.txt: fix grammatical errors
parse-remote: replace unnecessary sed invocation
Diffstat (limited to 't')
| -rw-r--r-- | t/README | 9 | ||||
| -rwxr-xr-x | t/t8001-annotate.sh | 11 |
2 files changed, 10 insertions, 10 deletions
@@ -201,7 +201,7 @@ we are testing. If you create files under t/ directory (i.e. here) that is not the top-level test script, never name the file to match the above pattern. The Makefile here considers all such files as the -top-level test script and tries to run all of them. A care is +top-level test script and tries to run all of them. Care is especially needed if you are creating a common test library file, similar to test-lib.sh, because such a library file may not be suitable for standalone execution. @@ -285,9 +285,8 @@ Do: - Check the test coverage for your tests. See the "Test coverage" below. - Don't blindly follow test coverage metrics, they're a good way to - spot if you've missed something. If a new function you added - doesn't have any coverage you're probably doing something wrong, + Don't blindly follow test coverage metrics; if a new function you added + doesn't have any coverage, then you're probably doing something wrong, but having 100% coverage doesn't necessarily mean that you tested everything. @@ -431,7 +430,7 @@ library for your script to use. - test_tick Make commit and tag names consistent by setting the author and - committer times to defined stated. Subsequent calls will + committer times to defined state. Subsequent calls will advance the times by a fixed amount. - test_commit <message> [<filename> [<contents>]] diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh index 45cb60e..41962f0 100755 --- a/t/t8001-annotate.sh +++ b/t/t8001-annotate.sh @@ -6,10 +6,11 @@ test_description='git annotate' PROG='git annotate' . "$TEST_DIRECTORY"/annotate-tests.sh -test_expect_success \ - 'Annotating an old revision works' \ - '[ $(git annotate file master | awk "{print \$3}" | grep -c "^A$") -eq 2 ] && \ - [ $(git annotate file master | awk "{print \$3}" | grep -c "^B$") -eq 2 ]' - +test_expect_success 'Annotating an old revision works' ' + git annotate file master >result && + awk "{ print \$3; }" <result >authors && + test 2 = $(grep A <authors | wc -l) && + test 2 = $(grep B <authors | wc -l) +' test_done |