From 642fd0e5e6795b9b1cd3d7decfb9d2d98760f06f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Oct 2017 20:29:23 +0100 Subject: [PATCH] git-debrebase: fix parents in generated commits (!) --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.30.2