mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: filter for {'code':'info'} in p4CmdList

Browse Source 
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 <miguel.torroja@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miguel Torroja
2017-07-13 09:00:35 +02:00
committed by Junio C Hamano
parent b596b3b920
commit 1997e91f4b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t9831-git-p4-triggers.sh
View File

@ -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" &&