git-debrebase: new-upstream-v0 bugfixes

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

1 files changed, 12 insertions, 8 deletions

diff --git a/git-debrebase b/git-debrebase
index e8dfbf9..aaf7f93 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -822,9 +822,10 @@ sub cmd_new_upstream_v0 () {
         my ($n, @x) = @_; # may be ''
         my $pc = $pieces{$n} //= {
     	    Name => $n,
-	    Desc => ($n ? "upstream piece $n" : "upstream (main piece"),
+	    Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"),
 	};
 	while (my $k = shift @x) { $pc->{$k} = shift @x; }
+        $pc;
     };
 
     my @newpieces;
@@ -883,14 +884,17 @@ sub cmd_new_upstream_v0 () {
 
     foreach my $pc (values %pieces) {
 	if (!$pc->{Old}) {
-	    $problem->("introducing upstream piece $pc->{Name}");
+	    $problem->("introducing upstream piece \`$pc->{Name}'");
 	} elsif (!$pc->{New}) {
-	    $problem->("dropping upstream piece $pc->{Name}");
+	    $problem->("dropping upstream piece \`$pc->{Name}'");
 	} elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) {
 	    $problem->("not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}");
 	}
     }
 
+    printdebug "%pieces = ", (dd \%pieces), "\n";
+    printdebug "\@newpieces = ", (dd \@newpieces), "\n";
+
     if ($problems) {
 	if ($opt_force) {
 	    printf STDERR
@@ -945,19 +949,19 @@ sub cmd_new_upstream_v0 () {
 
 	# index now contains the breakwater merge contents
 
-	my $bw_tree = cmdoutput @git, qw(write_tree);
+	my $bw_tree = cmdoutput @git, qw(write-tree);
 	my @cmd = (@git, qw(commit-tree), $bw_tree);
 	push @cmd, qw(-p), $old_bw, qw(-p), $new_upstream;
 	push @cmd, qw(-m), "Update to upstream $new_upstream_version";
 	push @cmd, qw(-m),
 	    "[git-debrebase new-upstream breakwater $new_upstream_version]";
-	$new_bw = cmdoutput @git;
+	$new_bw = cmdoutput @cmd;
 
 	# Now we have to add a changelog stanza so the Debian version
 	# is right.
 
 	die if unlink "debian";
-	die unless $!==ENOTEMPTY;
+	die $! unless $!==ENOTEMPTY;
 	unlink "debian/changelog" or die $!;
 	open CN, ">", "debian/changelog" or die $!;
 	my $oldclog = git_cat_file ":debian/changelog";
@@ -977,14 +981,14 @@ END
 
 	# Now we have the final new breakwater branch in the index
 
-	$bw_tree = cmdoutput @git, qw(write_tree);
+	$bw_tree = cmdoutput @git, qw(write-tree);
 	@cmd = (@git, qw(commit-tree), $bw_tree);
 	push @cmd, qw(-p), $new_bw;
 	push @cmd, qw(-m),
 	    "Update changelog for new upstream $new_upstream_version";
 	push @cmd, qw(-m),
 	    "[git-debrebase new-upstream changelog $new_upstream_version]";
-	$new_bw = cmdoutput @git;
+	$new_bw = cmdoutput @cmd;
     };
 
     # we have constructed the new breakwater. we now need to commit to