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 (parent:
e3aeaf7
)
git-debrebase: wip rebase fixes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 5 Jun 2017 18:00:25 +0000
(19:00 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index e034abb91e760ba43d7ffe574b472ec26fa37e65..55f92e39b8858274ad820b7dfcafd2e9295c372b 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-340,14
+340,6
@@
sub walk {
my $rewrite_from_here = sub {
push @processed, { SpecialMethod => 'StartRewrite' };
};
my $rewrite_from_here = sub {
push @processed, { SpecialMethod => 'StartRewrite' };
};
- my $bomb = sub { # usage: return $bomb->();
- print $report " Unprocessable" if $report;
- $prprdelim->();
- if ($nogenerate) {
- return (undef,undef);
- }
- die "commit $cur: Cannot cope with this commit";
- };
my $cur = $input;
my $cur = $input;
@@
-360,6
+352,15
@@
sub walk {
$prdelim = "\n";
};
$prdelim = "\n";
};
+ my $bomb = sub { # usage: return $bomb->();
+ print $report " Unprocessable" if $report;
+ $prprdelim->();
+ if ($nogenerate) {
+ return (undef,undef);
+ }
+ die "commit $cur: Cannot cope with this commit";
+ };
+
for (;;) {
if (!defined $cur) {
push @deb_cl, { ExactlyParents => [] };
for (;;) {
if (!defined $cur) {
push @deb_cl, { ExactlyParents => [] };