diff options
| author | Miguel Torroja <miguel.torroja@gmail.com> | 2017-07-13 10:00:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 20:52:40 +0300 |
| commit | b596b3b920208acb775bb632288976377636ccd1 (patch) | |
| tree | 13d22c73681c7ae82a199f201267742976bb95ff /t/t9831-git-p4-triggers.sh | |
| parent | c625bf0ee80a2362ce59819ce011ee17f2a6b2ce (diff) | |
git-p4: parse marshal output "p4 -G" in p4 changes
The option -G of p4 (python marshal output) gives more context about the
data being output. That's useful when using the command "change -o" as
we can distinguish between warning/error line and real change description.
This fixes the case where a p4 trigger for "p4 change" is set and the command git-p4 submit is run.
Signed-off-by: Miguel Torroja <miguel.torroja@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9831-git-p4-triggers.sh')
| -rwxr-xr-x | t/t9831-git-p4-triggers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh index 28cafe4699..871544b1c9 100755 --- a/t/t9831-git-p4-triggers.sh +++ b/t/t9831-git-p4-triggers.sh @@ -66,7 +66,7 @@ test_expect_failure 'import with extra info lines from verbose p4 trigger' ' ) ' -test_expect_failure 'submit description with extra info lines from verbose p4 change trigger' ' +test_expect_success 'submit description with extra info lines from verbose p4 change trigger' ' test_when_finished cleanup_git && ( p4 triggers -i <<-EOF |