From: Ian Jackson Date: Sat, 7 Jan 2017 13:23:28 +0000 (+0000) Subject: dgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo. X-Git-Tag: archive/debian/2.16.2~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=7a3361bb3c0dab34d001bcda1c56ec42aec6e8b3;hp=014f97da094a9fcf874778410d96b80d26a4bf95 dgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo. Signed-off-by: Ian Jackson --- diff --git a/debian/changelog b/debian/changelog index fb10d5e6..4a13463b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -dgit (2.17~) unstable; urgency=medium +dgit (2.16.2~) unstable; urgency=medium - * + dgit-badcommit-fixup: + * Fix crash when running for 2nd time in bare repo. -- diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup index a9a8f60f..935f5dff 100755 --- a/dgit-badcommit-fixup +++ b/dgit-badcommit-fixup @@ -231,7 +231,7 @@ foreach my $rline (split /\n/, $refs) { or die "$_ ?"; if ($refname eq 'refs/dgit-rewrite/map') { $org_rewrite_map = $obj; - continue; + next; } next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/}; my $rewrite;