Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
$quilt_mode =~ m/gbp|dpm|unapplied/;
}
$quilt_mode =~ m/gbp|dpm|unapplied/;
}
+sub gbp_pq {
+ return (@gbp, qw(pq));
+}
+
#---------- remote protocol support, common ----------
# remote push initiator/responder protocol:
#---------- remote protocol support, common ----------
# remote push initiator/responder protocol:
eval {
runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
eval {
runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
};
if ($@) {
{ local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
};
if ($@) {
{ local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
($diffbits->{O2A} & 01)) { # some patches
quiltify_splitbrain_needed();
progress "dgit view: creating patches-applied version using gbp pq";
($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);
# 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);