From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Jul 2017 23:30:00 +0000 (-0700)
Subject: Merge branch 'mt/p4-parse-G-output'
X-Git-Tag: v2.14.0-rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f0b213699c744e5182305f1a15ff906bd9a7415;p=thirdparty%2Fgit.git

Merge branch 'mt/p4-parse-G-output'

Use "p4 -G" to make "p4 changes" output more Python-friendly
to parse.

* mt/p4-parse-G-output:
  git-p4: filter for {'code':'info'} in p4CmdList
  git-p4: parse marshal output "p4 -G" in p4 changes
  git-p4: git-p4 tests with p4 triggers
---

4f0b213699c744e5182305f1a15ff906bd9a7415