chiark / gitweb /
gbp options: Introduce gbp_pq function (nfc)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 8 Oct 2016 21:19:30 +0000 (22:19 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 8 Oct 2016 22:05:47 +0000 (23:05 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index def2c34..2ff76ae 100755 (executable)
--- 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);