From 472353a579b3c3fd645ea4f0aac582317e488775 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Fri, 29 Mar 2013 11:28:34 +0000 Subject: [PATCH] t7800: don't hide grep output Remove the stdin_contains and stdin_doesnt_contain helper functions which add nothing but hide the output of grep, hurting debugging. Suggested-by: Johannes Sixt Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- t/t7800-difftool.sh | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 017f55adf4..9fd09dbe93 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -23,16 +23,6 @@ prompt_given () test "$prompt" = "Launch 'test-tool' [Y/n]: branch" } -stdin_contains () -{ - grep >/dev/null "$1" -} - -stdin_doesnot_contain () -{ - ! stdin_contains "$1" -} - # Create a file on master and change it on branch test_expect_success PERL 'setup' ' echo master >file && @@ -296,24 +286,24 @@ test_expect_success PERL 'setup with 2 files different' ' test_expect_success PERL 'say no to the first file' ' (echo n && echo) >input && git difftool -x cat branch output && - stdin_contains m2 input && git difftool -x cat branch output && - stdin_contains master output && - stdin_contains tool output && - stdin_contains sub output && - stdin_contains sub output && - stdin_contains sub output && - stdin_contains sub