summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-08 22:01:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-08 23:05:47 +0100
commit7a0d541064203fb3db4661fc9ed265d5c8308bf5 (patch)
treee0834f44f1503108777e16348988659ab67b22ff /dgit
parent3a434e0ecac4387bb900a078b7d65c751b99f3bb (diff)
New import: Tidy up output from gbp pq
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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit9
1 files changed, 8 insertions, 1 deletions
diff --git a/dgit b/dgit
index cdf1670..def2c34 100755
--- a/dgit
+++ b/dgit
@@ -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:);