chiark / gitweb /
git-debrebase: fix parents in generated commits (!)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Oct 2017 19:29:23 +0000 (20:29 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
git-debrebase

index f73bf0c..b4eb684 100755 (executable)
@@ -665,7 +665,7 @@ sub walk ($;$$) {
            $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
            $ch =~ s{^parent .*\n}{}m;
            $ch =~ s{(?=^author)}{
-               map { "parent $_\n" } @parents
+               join '', map { "parent $_\n" } @parents
            }me or confess "$ch ?";
            if ($rewriting) {
                $ch =~ s{^committer .*$}{$committer_authline}m