summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-17 17:22:37 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-17 17:22:37 +0100
commit42a4e12f8b0511c915d1f3e174ce724642605c81 (patch)
tree45f2e8e14537f06d5915f5dcc7be5f082b9c2eb3 /dgit
parent916da427127794108f20f80d5018493002b81876 (diff)
deprecate 3.0 (quilt)
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit13
1 files changed, 9 insertions, 4 deletions
diff --git a/dgit b/dgit
index 487c1be..9573adf 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"}(); }