diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 22:19:30 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 23:05:47 +0100 |
commit | 0260f563bc269feefc6edca1af850d63db660552 (patch) | |
tree | 4e0daf498c6e14065f715c690b839246b1dcccc0 /dgit | |
parent | 7a0d541064203fb3db4661fc9ed265d5c8308bf5 (diff) |
gbp options: Introduce gbp_pq function (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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); |