diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-06-21 21:44:35 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 80a062713ecedac03c5ba113c596ee85cd71e5ec (patch) | |
tree | 0a011311d84e8145dd1b0f1c2198dd66dc85e456 /git-debrebase | |
parent | c3d0030260d0afae7d375977bc36a1f8e7eab8cb (diff) |
git-debrebase: rebase fixes
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/git-debrebase b/git-debrebase index e83822c..b3b5ea6 100755 --- a/git-debrebase +++ b/git-debrebase @@ -106,6 +106,7 @@ use strict; use Memoize; use Carp; +use POSIX; use Data::Dumper; use Debian::Dgit qw(:DEFAULT $wa); @@ -353,13 +354,6 @@ sub walk { $prdelim = "\n"; }; - my $build_start = sub { - my ($msg, $parent) = @_; - $prline->(" $msg"); - $build = $parent; - no warnings qw(exiting); last; - }; - my $bomb = sub { # usage: return $bomb->(); print $report " Unprocessable" if $report; $prprdelim->(); @@ -370,6 +364,14 @@ sub walk { }; my $build; + my $breakwater; + + my $build_start = sub { + my ($msg, $parent) = @_; + $prline->(" $msg"); + $build = $parent; + no warnings qw(exiting); last; + }; for (;;) { $cl = classify $cur; @@ -529,7 +531,6 @@ sub walk { next; } elsif ($method eq 'RecordBreakwaterTip') { $breakwater = $build; - last if $wantbrwonly; next; } elsif ($method eq 'DgitImportDebianUpdate') { $read_tree_debian->($cltree); @@ -565,9 +566,7 @@ sub walk { } }; - runcmd @git, qw(diff-tree --quiet), - map { $wantdebonly ? "$_:debian" : $_ } - $input, $build; + runcmd @git, qw(diff-tree --quiet), $input, $build; return ($build, $breakwater); } |