X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=7f68b098cb23a1f85d79cc2a8a46b450439305cb;hb=f5bb5d94a3c7d661b7f0253969e1490ffc994490;hp=fc310d54ff195e0249be5ce0002d626a0316e718;hpb=02768452a74006a6c588a5a10ca7881b70f4c984;p=dgit.git

diff --git a/dgit b/dgit
index fc310d54..7f68b098 100755
--- a/dgit
+++ b/dgit
@@ -552,26 +552,40 @@ sub pull () {
 }
 
 sub check_not_dirty () {
+    runcmd @git, qw(diff --quiet);
+}
+
+sub commit_quilty_patch () {
     my $output = cmdoutput @git, qw(status --porcelain);
-    if (length $output) {
-	my $m = "tree dirty:\n$output\n";
-	if (!$dryrun) {
-	    die $m;
-	} else {
-	    warn $m;
-	}
+    my $vsn = $dsc->{Version};
+    my %fixups = map {$_=>1}
+        (".pc/debian-changes-$vsn/","debian/patches/debian-changes-2.8-5");
+    my @files;
+    foreach my $l (split /\n/, $output) {
+	next unless $l =~ s/^\?\? //;
+	next unless $fixups{$l};
+	push @files, $l;
+    }
+    print DEBUG "checking for quilty\n", Dumper(\@files);
+    if (@files == 2) {
+	my $m = "Commit Debian 3.0 (quilt) metadata";
+	print "$m\n";
+	runcmd_ordryrun @git, qw(add), @files;
+	runcmd_ordryrun @git, qw(commit -m), $m;
     }
 }
 
 sub dopush () {
-    runcmd @git, qw(diff --quiet HEAD);
     print DEBUG "actually entering push\n";
-    runcmd qw(debian/rules clean);
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
     my $dscfn = "${package}_$clogp->{Version}.dsc";
     stat "../$dscfn" or die "$dscfn $!";
     $dsc = parsecontrol("../$dscfn");
+    print DEBUG "format $dsc->{Format}\n";
+    if ($dsc->{Format} eq '3.0 (quilt)') {
+	commit_quilty_patch();
+    }
     check_not_dirty();
     prep_ud();
     chdir $ud or die $!;
@@ -712,6 +726,7 @@ sub cmd_build {
     my $clogp = parsechangelog();
     $suite = $clogp->{Distribution};
     $package = $clogp->{Source};
+    canonicalise_suite() unless grep { m/^--git-debian-branch/ } @ARGV;
     runcmd_ordryrun
 	qw(git-buildpackage -us -uc --git-no-sign-tags),
 	'--git-builder=dpkg-buildpackage -i\.git/ -I.git',