From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 31 Jan 2018 15:12:54 +0000 (+0000)
Subject: git-debrebase: new-upstream-v0: use make_commit another time (nfc)
X-Git-Tag: archive/debian/5.0~283
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=26d8ef1f24bb805667e032f54c224050154bd55d;hp=9b710281a7c7de889942b8a4330b5265bb1e2305

git-debrebase: new-upstream-v0: use make_commit another time (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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