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

In particular, do not fail utterly if dpkg-source and gbp
disagree. Closes:#848843.

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

diff --git a/debian/changelog b/debian/changelog
index 846fe2306bdf901a9b88d5fd4fb4d3eda3d62bd6..850681b9d9153401610f04e45157490ca8a53ff0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dgit (2.13~) unstable; urgency=medium
     stretch.  Closes:#848901.
   * Improve "cannot represent change" message: print the git old and new
     modes too.
+  * Import fix: Switch back to unpa branch on patch import iterations.
+    In particular, do not fail utterly if dpkg-source and gbp disagree.
+    Closes:#848843.
 
  --
 

diff --git a/dgit b/dgit
index acb456373190fcd29e555eaf3353befbfc70c4ef..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 $@;