git-debrebase: test suite: gdr-import-dgit: extend

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 5fa4f47377ae3e4035606f989beaee4aed40afb2..8253cb7a17aec5cdfa9e964e7b705b808a5747f2 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -738,7 +738,6 @@ sub walk ($;$$) {
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {
                $read_tree_debian->($cltree);
-               rm_subdir_cached qw(debian/patches);
            } elsif ($method eq 'DgitImportUpstreamUpdate') {
                confess unless $rewriting;
                my $differs = (get_differs $build, $cltree);
@@ -758,7 +757,7 @@ sub walk ($;$$) {
            my $newtree = cmdoutput @git, qw(write-tree);
            my $ch = $cl->{Hdr};
            $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
-           $ch =~ s{^parent .*\n}{}m;
+           $ch =~ s{^parent .*\n}{}mg;
            $ch =~ s{(?=^author)}{
                join '', map { "parent $_\n" } @parents
            }me or confess "$ch ?";