gbp pq import can print some warnings if it doesn't like the patches
much. There is no point showing these warnings to the user of `dgit
clone' or `dgit fetch'.
As for the warnings in split brain mode, we will leave those, and
leave them with colour enabled.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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
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:);