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

diff --git a/dgit b/dgit
index def2c349..2ff76ae2 100755
--- a/dgit
+++ b/dgit
@@ -246,6 +246,10 @@ sub quiltmode_splitbrain () {
     $quilt_mode =~ m/gbp|dpm|unapplied/;
 }
 
+sub gbp_pq {
+    return (@gbp, qw(pq));
+}
+
 #---------- remote protocol support, common ----------
 
 # remote push initiator/responder protocol:
@@ -1845,7 +1849,7 @@ END
 
 	eval {
 	    runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
-		@gbp, qw(pq import);
+		gbp_pq, qw(import);
 	};
 	if ($@) {
 	    { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
@@ -3723,7 +3727,7 @@ END
 	($diffbits->{O2A} & 01)) { # some patches
 	quiltify_splitbrain_needed();
 	progress "dgit view: creating patches-applied version using gbp pq";
-	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+	runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
 	# gbp pq import creates a fresh branch; push back to dgit-view
 	runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
 	runcmd @git, qw(checkout -q dgit-view);