X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=def2c349af4668589df46d30c7ba09d61b7a8d72;hb=7a0d541064203fb3db4661fc9ed265d5c8308bf5;hp=cdf16700d4b9053f146731f6b68382a3e9f88cde;hpb=3a434e0ecac4387bb900a078b7d65c751b99f3bb;p=dgit.git

diff --git a/dgit b/dgit
index cdf16700..def2c349 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:);