X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=fc4e8786f34bc963115ecc888ebf356db791726e;hb=6f509d51d3adfab107ccbc78637cfc81e3b5059a;hp=81c5ff91558733cd61ec492f370f61777ae1e49f;hpb=f003a2342e846c512393749568fe85477a9f282a;p=dgit.git

diff --git a/dgit b/dgit
index 81c5ff91..fc4e8786 100755
--- a/dgit
+++ b/dgit
@@ -1448,7 +1448,7 @@ END
     my $cversion = getfield $clogp, 'Version';
     progress "synthesised git commit from .dsc $cversion";
     if ($lastpush_hash) {
-	runcmd @git, qw(reset --hard), $lastpush_hash;
+	runcmd @git, qw(reset -q --hard), $lastpush_hash;
 	runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
 	my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
 	my $oversion = getfield $oldclogp, 'Version';
@@ -1850,11 +1850,15 @@ sub get_source_format () {
 sub madformat ($) {
     my ($format) = @_;
     return 0 unless $format eq '3.0 (quilt)';
+    our $quilt_mode_warned;
     if ($quilt_mode eq 'nocheck') {
-	progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
+	progress "Not doing any fixup of \`$format' due to".
+	    " ----no-quilt-fixup or --quilt=nocheck"
+	    unless $quilt_mode_warned++;
 	return 0;
     }
-    progress "Format \`$format', checking/updating patch stack";
+    progress "Format \`$format', need to check/update patch stack"
+	unless $quilt_mode_warned++;
     return 1;
 }
 
@@ -2557,7 +2561,7 @@ sub quiltify_tree_sentinelfiles ($) {
         qw(-- debian/rules debian/control);
     $r =~ s/\n/,/g;
     return $r;
-				 }
+}
 
 sub quiltify_splitbrain_needed () {
     if (!$split_brain) {
@@ -2943,8 +2947,6 @@ sub quilt_fixup_singlepatch ($$$) {
 
     chdir "work";
     commit_quilty_patch();
-
-    
 }
 
 sub quilt_fixup_multipatch ($$$) {