chiark / gitweb /
git-debrebase: git-debrebase fixes
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Apr 2017 19:34:50 +0000 (20:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
git-debrebase

index 1b77b08..428f9e6 100755 (executable)
@@ -393,13 +393,13 @@ sub walk {
            if ($differs & D_UPS) {
                printf $report " D_UPS" if $report;
                push @deb_cl, {
-                    %r,
+                    %$cl,
                     SpecialMethod => 'DgitImportUpstreamUpdate',
                     $xmsg->("convert dgit import: debian changes")
                 };
            }
            push @deb_cl, {
-               %r,
+               %$cl,
                SpecialMethod => 'DgitImportDebianUpdate',
                 $xmsg->("convert dgit import: upstream changes")
            };
@@ -459,9 +459,9 @@ sub walk {
                $current_method = $cl;
                next;
            }
-           $method = $cl->{SpecialMethod} // $current_method;
+           my $method = $cl->{SpecialMethod} // $current_method;
            my @parents = ($build);
-           my $cltree = $cl->{CommitId}
+           my $cltree = $cl->{CommitId};
            if ($method eq 'Debian') {
                $read_tree_debian->($cltree);
            } elsif ($method eq 'Upstream') {
@@ -475,7 +475,7 @@ sub walk {
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {
                $read_tree_debian->($cltree);
-               $rm_tree_cached(qw(debian/patches));
+               $rm_tree_cached->(qw(debian/patches));
            } elsif ($method eq 'DgitImportUpstreamUpdate') {
                $read_tree_upstream->($cltree);
                push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };