X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=9573adf2f304b7fa7eac5290b618f013d46b0987;hb=42a4e12f8b0511c915d1f3e174ce724642605c81;hp=487c1be7aa1ffb663636fe3678820c95d5434392;hpb=916da427127794108f20f80d5018493002b81876;p=dgit.git

diff --git a/dgit b/dgit
index 487c1be7..9573adf2 100755
--- a/dgit
+++ b/dgit
@@ -555,9 +555,9 @@ sub check_not_dirty () {
     runcmd @git, qw(diff --quiet);
 }
 
-sub commit_quilty_patch () {
+sub commit_quilty_patch ($) {
+    my ($vsn) = @_;
     my $output = cmdoutput @git, qw(status --porcelain);
-    my $vsn = $dsc->{Version};
     my %fixups = map {$_=>1}
         (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn");
     my @files;
@@ -585,7 +585,7 @@ sub dopush () {
     print DEBUG "format $dsc->{Format}\n";
     if ($dsc->{Format} eq '3.0 (quilt)') {
 	print "Format \`$dsc->{Format}', urgh\n";
-	commit_quilty_patch();
+	commit_quilty_patch($dsc->{Version});
     }
     check_not_dirty();
     prep_ud();
@@ -735,6 +735,11 @@ sub cmd_build {
 	@ARGV;
 }
 
+sub cmd_quilt_fixup {
+    my $clogp = parsechangelog();
+    commit_quilty_patch($clogp->{Version});
+}
+
 sub parseopts () {
     my $om;
     while (@ARGV) {
@@ -784,5 +789,5 @@ parseopts();
 print STDERR "DRY RUN ONLY\n" if $dryrun;
 die unless @ARGV;
 my $cmd = shift @ARGV;
-
+$cmd =~ y/-/_/;
 { no strict qw(refs); &{"cmd_$cmd"}(); }