summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-17 17:12:32 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-17 17:12:32 +0100
commit916da427127794108f20f80d5018493002b81876 (patch)
treee3e223b1d447a0a2c3581935034c1f44ec975e9a /dgit
parentf5bb5d94a3c7d661b7f0253969e1490ffc994490 (diff)
fix quilt fixup
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit3
1 files changed, 2 insertions, 1 deletions
diff --git a/dgit b/dgit
index 7f68b09..487c1be 100755
--- a/dgit
+++ b/dgit
@@ -559,7 +559,7 @@ sub commit_quilty_patch () {
my $output = cmdoutput @git, qw(status --porcelain);
my $vsn = $dsc->{Version};
my %fixups = map {$_=>1}
- (".pc/debian-changes-$vsn/","debian/patches/debian-changes-2.8-5");
+ (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn");
my @files;
foreach my $l (split /\n/, $output) {
next unless $l =~ s/^\?\? //;
@@ -584,6 +584,7 @@ sub dopush () {
$dsc = parsecontrol("../$dscfn");
print DEBUG "format $dsc->{Format}\n";
if ($dsc->{Format} eq '3.0 (quilt)') {
+ print "Format \`$dsc->{Format}', urgh\n";
commit_quilty_patch();
}
check_not_dirty();