diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-30 14:10:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-30 14:10:41 -0700 |
| commit | 17a02998078923f2d62811326d130de991d1a95a (patch) | |
| tree | f33b6e5758233f3f7ae05fe0d8565323de381820 /t/t8001-annotate.sh | |
| parent | 44a9cedb005b0b8be31dccd8e6ddf97074a01345 (diff) | |
| parent | 806e0aba2e5d976233703e6ff517af10329e4048 (diff) | |
| download | git-17a02998078923f2d62811326d130de991d1a95a.tar.gz | |
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/t8001-annotate.sh')
| -rwxr-xr-x | t/t8001-annotate.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh index 45cb60ea4b..41962f04a7 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 |