From 1997e91f4b36649e7e4f693ca9f35c7a6219de8c Mon Sep 17 00:00:00 2001 From: Miguel Torroja Date: Thu, 13 Jul 2017 09:00:35 +0200 Subject: git-p4: filter for {'code':'info'} in p4CmdList The function p4CmdList accepts a new argument: skip_info. When set to True it ignores any 'code':'info' entry (skip_info=False by default). That allows us to fix some of the tests in t9831-git-p4-triggers.sh known to be broken with verobse p4 triggers Signed-off-by: Miguel Torroja Signed-off-by: Junio C Hamano --- t/t9831-git-p4-triggers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh index 871544b1c..bbcf14c66 100755 --- a/t/t9831-git-p4-triggers.sh +++ b/t/t9831-git-p4-triggers.sh @@ -20,7 +20,7 @@ test_expect_success 'init depot' ' ) ' -test_expect_failure 'clone with extra info lines from verbose p4 trigger' ' +test_expect_success 'clone with extra info lines from verbose p4 trigger' ' test_when_finished cleanup_git && ( p4 triggers -i <<-EOF @@ -38,7 +38,7 @@ test_expect_failure 'clone with extra info lines from verbose p4 trigger' ' ) ' -test_expect_failure 'import with extra info lines from verbose p4 trigger' ' +test_expect_success 'import with extra info lines from verbose p4 trigger' ' test_when_finished cleanup_git && ( cd "$cli" && -- cgit v1.2.1