diff options
-rw-r--r-- | TODO.BRANCH | 3 | ||||
-rwxr-xr-x | dgit | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH index 0951402..ec77c73 100644 --- a/TODO.BRANCH +++ b/TODO.BRANCH @@ -5,9 +5,6 @@ OTHER Honour (and strip) Gbp-Pq Topic and Gbp-Pq Name * Provide --gpbpq[=:] options - * When invoking gbp pq internally, use --color=off - * When invoking gbp pq during import, redirect stderr - and print only on failure * Fix up README.dsc-import to describe actual algorithm as implemented @@ -1843,7 +1843,14 @@ END local $ENV{GIT_AUTHOR_EMAIL} = $authline[1]; local $ENV{GIT_AUTHOR_DATE} = $authline[2]; - runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import); + eval { + runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output', + @gbp, qw(pq import); + }; + if ($@) { + { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; } + die $@; + } my $gapplied = git_rev_parse('HEAD'); my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:); |