X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=fd05c6b46a67ab92e2db225e198910d17cb5c9ec;hb=ae3881653a4639a9c3017ffdb187b49ebe9fcea3;hp=3458b12f5d86d93c2de804989afbed423cc43e92;hpb=8417abd83a6d2659bd556476ddee0a232d579eca;p=dgit.git

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);
     };
 }