diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-12-20 21:40:15 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-12-20 21:40:17 +0000 |
commit | e70e2c7b6a8411ba86462bf96988732ef3a4ddd0 (patch) | |
tree | ebad4cdf4c65bf652da5ef59973763769cf3ee1c | |
parent | 03f67737414ebb3631f097d45c5aff9a83e63b1b (diff) |
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>
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 846fe23..850681b 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. -- @@ -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 $@; |