Import fix: Switch back to unpa branch on patch import iterations.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 9a8d22147a9b0a80e93f54c20b64a5113c7e962a..1e7c923eea6e8070b3f2254af6f8a85570d05aa4 100755 (executable)
--- 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)" ];
            }
        }