summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 11:39:05 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:48 +0100
commit411fe55e96c646557ec19614888658a6cea693b4 (patch)
treea4c690ac3375720711f316eddda83d59c631d8d8
parent0d6cdd1cec853a132aacc3f52c1cb7c585e02da5 (diff)
Split brain: Use `gbp pq' (which exists) not `gbp-pq' (which doesn't)
-rwxr-xr-xdgit8
1 files changed, 4 insertions, 4 deletions
diff --git a/dgit b/dgit
index bee6bcd..455b375 100755
--- a/dgit
+++ b/dgit
@@ -86,7 +86,7 @@ our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
our (@dpkggenchanges) = qw(dpkg-genchanges);
our (@mergechanges) = qw(mergechanges -f);
-our (@gbppq) = qw(gbp-pq);
+our (@gbp) = qw(gbp);
our (@changesopts) = ('');
our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
@@ -2593,10 +2593,10 @@ sub quiltify_splitbrain ($$$$$$) {
if ($quilt_mode =~ m/gbp|unapplied/ &&
($diffbits->{O2A} & 01)) { # some patches
quiltify_splitbrain_needed();
- progress "creating patches-applied version using gbp-pq";
+ progress "creating patches-applied version using gbp pq";
open STDOUT, ">/dev/null" or die $!;
- runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
- # gbp-pq import creates a fresh branch; push back to dgit-view
+ runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq 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);
}