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:
85644f9
)
git-debrebase: fixes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 14 Jun 2017 23:20:02 +0000
(
00:20
+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 7b64bf51f5cf65ff6957ecab6cd784ff24af8535..4fb5e91fd7e62c96a41a6b27b0ed5e15519d77ef 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-342,13
+342,6
@@
sub walk {
push @brw_cl, $sp_cl;
push @processed, $sp_cl;
};
push @brw_cl, $sp_cl;
push @processed, $sp_cl;
};
- my $build_start = sub {
- my ($msg, $parents) = @_;
- $prline->(" $msg");
- push @brw_cl, { ExactlyParents => $parents };
- no qw(exiting); last;
- };
-
my $cur = $input;
my $prdelim = "";
my $cur = $input;
my $prdelim = "";
@@
-360,6
+353,13
@@
sub walk {
$prdelim = "\n";
};
$prdelim = "\n";
};
+ my $build_start = sub {
+ my ($msg, $parents) = @_;
+ $prline->(" $msg");
+ push @brw_cl, { ExactlyParents => $parents };
+ no warnings qw(exiting); last;
+ };
+
my $bomb = sub { # usage: return $bomb->();
print $report " Unprocessable" if $report;
$prprdelim->();
my $bomb = sub { # usage: return $bomb->();
print $report " Unprocessable" if $report;
$prprdelim->();
@@
-389,7
+389,7
@@
sub walk {
$cur = $p0;
next;
} elsif ($ty eq 'BreakwaterStart') {
$cur = $p0;
next;
} elsif ($ty eq 'BreakwaterStart') {
- $build_start
('FirstPackaging',[$cur]}
;
+ $build_start
->('FirstPackaging',[$cur])
;
} elsif ($ty eq 'Upstream') {
push @upp_cl, $cl;
$cur = $p0;
} elsif ($ty eq 'Upstream') {
push @upp_cl, $cl;
$cur = $p0;
@@
-464,7
+464,7
@@
sub walk {
}
$prline->(" Import");
$rewrite_from_here->();
}
$prline->(" Import");
$rewrite_from_here->();
- $upp_limit //= $#upp; # further, deeper, patches discarded
+ $upp_limit //= $#upp
_cl
; # further, deeper, patches discarded
$cur = $ovwr;
next;
} else {
$cur = $ovwr;
next;
} else {