diff options
| author |  Miguel Torroja <miguel.torroja@gmail.com> | 2017-07-13 09:00:35 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-07-13 10:52:42 -0700 |
| commit | 1997e91f4b36649e7e4f693ca9f35c7a6219de8c (patch) | |
| tree | efc8dc35912fa3cd05c753757ec15232f122c21c /Documentation/merge-strategies.txt | |
| parent | git-p4: parse marshal output "p4 -G" in p4 changes (diff) | |
| download | tgif-1997e91f4b36649e7e4f693ca9f35c7a6219de8c.tar.xz | |
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 <miguel.torroja@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions