in_workarea sub {
mkdir $rd or $!==EEXIST or die $!;
my $current_method;
- my $want_tree_debian = $build;
- my $want_tree_upstream = $build;
+ my $want_debian = $build;
+ my $want_upstream = $build;
- my $read_tree_upstream = sub { ($want_tree_upstream) = @_; };
- my $read_tree_debian = sub { ($want_tree_debian) = @_; };
+ my $read_tree_upstream = sub { ($want_upstream) = @_; };
+ my $read_tree_debian = sub { ($want_debian) = @_; };
foreach my $cl (qw(Debian), (reverse @brw_cl),
{ SpecialMethod => 'RecordBreakwaterTip' },
}
}
if ($rewriting || $opt_careful) {
- read_tree_upstream $want_tree_upstream, 0, $want_tree_debian;
+ read_tree_upstream $want_upstream, 0, $want_debian;
my $newtree = cmdoutput @git, qw(write-tree);
my $ch = $cl->{Hdr};