From: Junio C Hamano Date: Mon, 16 Aug 2010 16:41:48 GMT Subject: Re: [PATCH 2/2] t7006 (pager): add missing TTY prerequisite Message-ID: <7vd3ticxwz.fsf@alter.siamese.dyndns.org> In-Reply-To: <20100816081126.GC17566@burratino> Jonathan Nieder writes: > The config pagination test should not run if there is not a tty > available to force pagination on. > > Reported-by: Thomas Rast > Signed-off-by: Jonathan Nieder > --- > This one fixes for “config: run setup_git_directory_gently() > sooner”. Somehow we didn't seem to have got 1/2, but here is what I'll queue. By the way, could you stop using those "pretty quotes" and stick to the good old "ASCII 0x22" double-quotes? I find them ugly in the git log output. -- >8 -- From: Jonathan Nieder Date: Mon, 16 Aug 2010 03:08:34 -0500 Subject: [PATCH] t7006 (pager): add missing TTY prerequisites The "git bundle unbundle" and "git config" pagination tests are not supposed to run when stdout is not a terminal and IO::Pty not available to make one on the fly. Reported-by: Thomas Rast Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t7006-pager.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 017565f..fb744e3 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -134,7 +134,7 @@ test_expect_success TTY 'configuration can disable pager' ' ! test -e paginated.out ' -test_expect_success 'git config uses a pager if configured to' ' +test_expect_success TTY 'git config uses a pager if configured to' ' rm -f paginated.out && git config pager.config true && test_when_finished "git config --unset pager.config" && @@ -142,7 +142,7 @@ test_expect_success 'git config uses a pager if configured to' ' test -e paginated.out ' -test_expect_success 'configuration can enable pager (from subdir)' ' +test_expect_success TTY 'configuration can enable pager (from subdir)' ' rm -f paginated.out && mkdir -p subdir && git config pager.bundle true && -- 1.7.2.1.224.g2f41ea