From 53389b4ddc2d290f83e439fe36081e2d3e8d4b4c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 20 Jun 2018 16:35:20 +0100
Subject: [PATCH] git-debrebase: suppress gbp pq export output

Except in case of error.  Closes:#901809.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 2 ++
 git-debrebase    | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fc7aebb8..c49b783e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dgit (5.1~) unstable; urgency=medium
   * git-debrebase manpages: Fix typos and etc.
   * git-debrebase: new-upstream: fix (this time for sure) ff check
     handling of multi-piece upstreams.
+  * git-debrebase: suppress gbp pq export output, except in
+    case of error.  Closes:#901809.
 
  --
 
diff --git a/git-debrebase b/git-debrebase
index 3458b12f..fd05c6b4 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -34,6 +34,7 @@ use Data::Dumper;
 use Getopt::Long qw(:config posix_default gnu_compat bundling);
 use Dpkg::Version;
 use File::FnMatch qw(:fnmatch);
+use File::Copy;
 
 our ($opt_force, $opt_noop_ok, @opt_anchors);
 our ($opt_defaultcmd_interactive);
@@ -1495,7 +1496,12 @@ sub make_patches_staged ($) {
     in_workarea sub {
 	runcmd @git, qw(checkout -q -b bw), $secret_bw;
 	runcmd @git, qw(checkout -q -b patch-queue/bw), $secret_head;
-	runcmd qw(gbp pq export);
+	my @gbp_cmd = (qw(gbp pq export));
+	my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd;
+	if ($r) {
+	    { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
+	    failedcmd @gbp_cmd;
+	}
 	runcmd @git, qw(add debian/patches);
     };
 }
-- 
2.30.2