X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=1e7c923eea6e8070b3f2254af6f8a85570d05aa4;hb=e70e2c7b6a8411ba86462bf96988732ef3a4ddd0;hp=9a8d22147a9b0a80e93f54c20b64a5113c7e962a;hpb=1f7b9876c5641666901f40888eb8a975449569c1;p=dgit.git

diff --git a/dgit b/dgit
index 9a8d2214..1e7c923e 100755
--- a/dgit
+++ b/dgit
@@ -2367,6 +2367,8 @@ END
 	my $path = $ENV{PATH} or die;
 
 	foreach my $use_absurd (qw(0 1)) {
+	    runcmd @git, qw(checkout -q unpa);
+	    runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
 	    local $ENV{PATH} = $path;
 	    if ($use_absurd) {
 		chomp $@;
@@ -4509,7 +4511,7 @@ sub quiltify_trees_differ ($$;$$$) {
 	    };
 	    if ($@) {
 		local $/="\n"; chomp $@;
-		push @$unrepres, [ $f, $@ ];
+		push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
 	    }
 	}