diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:20:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:20:40 -0700 |
| commit | c336bc104c47cc9c2f7caf6bce468fe00a8f6850 (patch) | |
| tree | 501143681bb20b9d4642e5029a77bec2d321482c /t | |
| parent | e70d1632bdaf25a9ee528e78133cab319083eade (diff) | |
| parent | bafc478f1618534fcb85bedc0fa224bd2d462441 (diff) | |
| download | git-c336bc104c47cc9c2f7caf6bce468fe00a8f6850.tar.gz git-c336bc104c47cc9c2f7caf6bce468fe00a8f6850.tar.xz | |
Sync with 1.7.11.7
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0070-fundamental.sh | 5 | ||||
| -rwxr-xr-x | t/t7007-show.sh | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh index 9bee8bfd2..da2c504e5 100755 --- a/t/t0070-fundamental.sh +++ b/t/t0070-fundamental.sh @@ -25,4 +25,9 @@ test_expect_success POSIXPERM 'mktemp to unwritable directory prints filename' ' grep "cannotwrite/test" err ' +test_expect_success 'check for a bug in the regex routines' ' + # if this test fails, re-build git with NO_REGEX=1 + test-regex +' + test_done diff --git a/t/t7007-show.sh b/t/t7007-show.sh index a40cd3630..e41fa00b8 100755 --- a/t/t7007-show.sh +++ b/t/t7007-show.sh @@ -108,4 +108,16 @@ test_expect_success 'showing range' ' test_cmp expect actual.filtered ' +test_expect_success '-s suppresses diff' ' + echo main3 >expect && + git show -s --format=%s main3 >actual && + test_cmp expect actual +' + +test_expect_success '--quiet suppresses diff' ' + echo main3 >expect && + git show --quiet --format=%s main3 >actual && + test_cmp expect actual +' + test_done |