From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Aug 2014 16:39:37 +0000 (+0100)
Subject: Do not spew diff output to terminal (by default).  Closes:#736526.
X-Git-Tag: debian/0.22~33
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c0fcc7499118fdba35f817ff2f8765b7a1534e2d

Do not spew diff output to terminal (by default).  Closes:#736526.
---

diff --git a/debian/changelog b/debian/changelog
index bd08454e..f0f2eb90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dgit (0.22~experimental1) experimental; urgency=low
   * Include canonicalised suite name in signed tag message.
   * Mention cross-version dgit rpush incompatibility in manpage.
   * New script tests/using-intree for running tests on the source tree.
+  * Do not spew diff output to terminal (by default).  Closes:#736526.
 
   Major new feature, currently stalled awaiting server infrastructure:
   * dgit-repos-server: New program for receiving signed-tag-based
diff --git a/dgit b/dgit
index 4b218a3b..1fdca6c0 100755
--- a/dgit
+++ b/dgit
@@ -1391,13 +1391,16 @@ sub dopush () {
         $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     changedir '../../../..';
-    my @diffcmd = (@git, qw(diff --exit-code), $tree);
+    my $diffopt = $debug>0 ? '--exit-code' : '--quiet';
+    my @diffcmd = (@git, qw(diff), $diffopt, $tree);
     printcmd \*DEBUG,$debugprefix."+",@diffcmd;
     $!=0; $?=0;
     if (system @diffcmd) {
 	if ($! && $?==256) {
 	    fail "$dscfn specifies a different tree to your HEAD commit;".
-		" perhaps you forgot to build";
+		" perhaps you forgot to build".
+		($diffopt eq '--exit-code' ? "" :
+		 " (run with -D to see full diff output)");
 	} else {
 	    failedcmd @diffcmd;
 	}