From 26d8ef1f24bb805667e032f54c224050154bd55d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 31 Jan 2018 15:12:54 +0000 Subject: [PATCH 1/1] git-debrebase: new-upstream-v0: use make_commit another time (nfc) Signed-off-by: Ian Jackson --- git-debrebase | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/git-debrebase b/git-debrebase index df5d27e6..db132e3f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -939,15 +939,12 @@ sub cmd_new_upstream_v0 () { if (@newpieces > 1) { # need to make the upstream subtree merge commit - my $us_tree = cmdoutput @git, qw(write-tree); - my @cmd = (@git, qw(commit-tree), $us_tree); - push @cmd, qw(-p), $_ foreach @upstream_merge_parents; - push @cmd, qw(-m), "Combine upstreams for $new_upstream_version"; - push @cmd, qw(-m), - "[git-debrebase new-upstream combine . ". - (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]). - "]"; - $new_upstream = cmdoutput @cmd; + $new_upstream = make_commit \@upstream_merge_parents, + [ "Combine upstreams for $new_upstream_version", + ("[git-debrebase new-upstream combine . ". + (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]). + "]"), + ]; } # $new_upstream is either the single upstream commit, or the -- 2.30.2