From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 21:13:41 +0000 (+0000)
Subject: git-debrebase: bugfix
X-Git-Tag: archive/debian/5.0~198
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4caaec322319aafb5886a2ad2fb5abd53181d92a

git-debrebase: bugfix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index aacad917..8253cb7a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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 ?";