From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Oct 2017 19:29:23 +0000 (+0100)
Subject: fix parents in generated commits (!)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=38d893aad5cab3bd2aaffa6d194c9cb0e988ee07;p=dgit.git

fix parents in generated commits (!)
---

diff --git a/git-debrebase b/git-debrebase
index f73bf0c1..b4eb684d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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