summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-10-22 20:29:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit642fd0e5e6795b9b1cd3d7decfb9d2d98760f06f (patch)
treeb0cf11061c2611e1f91adf25e2cf342a456b216c /git-debrebase
parentf3af4f8354f80fcb10e2329010eac9686dc070a8 (diff)
git-debrebase: fix parents in generated commits (!)
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index f73bf0c..b4eb684 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