chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0d6cdd1
)
Split brain: Use `gbp pq' (which exists) not `gbp-pq' (which doesn't)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 10:39:05 +0000
(11:39 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:48 +0000
(16:47 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index bee6bcdb7ef56f0379458b656710206efc6896bb..455b375e96e13a7c0f790514e8169fe75ab39490 100755
(executable)
--- 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 (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
our (@dpkggenchanges) = qw(dpkg-genchanges);
our (@mergechanges) = qw(mergechanges -f);
-our (@gbp
pq) = qw(gbp-pq
);
+our (@gbp
) = qw(gbp
);
our (@changesopts) = ('');
our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
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();
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 $!;
open STDOUT, ">/dev/null" or die $!;
- runcmd shell_cmd 'exec >/dev/null', @gbp
pq, 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);
}
runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
runcmd @git, qw(checkout -q dgit-view);
}