From: Ian Jackson Date: Tue, 20 Dec 2016 21:40:15 +0000 (+0000) Subject: Import fix: Switch back to unpa branch on patch import iterations. X-Git-Tag: archive/debian/2.13~5 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e70e2c7b6a8411ba86462bf96988732ef3a4ddd0;hp=03f67737414ebb3631f097d45c5aff9a83e63b1b;p=dgit.git 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 --- diff --git a/debian/changelog b/debian/changelog index 846fe230..850681b9 100644 --- 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 acb45637..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 $@;