chiark / gitweb /
git-debrebase: bugfix
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 21:13:41 +0000 (21:13 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:11 +0000 (16:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index aacad91771bdd88746b08b68236522039be276bf..8253cb7a17aec5cdfa9e964e7b705b808a5747f2 100755 (executable)
@@ -757,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 ?";