Do not spew diff output to terminal (by default). Print sensible message instead...

diff --git a/debian/changelog b/debian/changelog
index f0f2eb90b0fe1d5a1ec9c714bf1a7f9d28c2b6e5..47ce6c2d46bbb556cb1eaad3ef9f76558ee54b0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ 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.
+  * Do not spew diff output to terminal (by default).  Print sensible
+    message instead.  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 1fdca6c031d113b221fa64e55be0fa54625a5109..843c7ec614f36289a3a06526e6a06c666852d598 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1395,8 +1395,9 @@ sub dopush () {
     my @diffcmd = (@git, qw(diff), $diffopt, $tree);
     printcmd \*DEBUG,$debugprefix."+",@diffcmd;
     $!=0; $?=0;
-    if (system @diffcmd) {
-       if ($! && $?==256) {
+    my $r = system @diffcmd;
+    if ($r) {
+       if ($r==256) {
            fail "$dscfn specifies a different tree to your HEAD commit;".
                " perhaps you forgot to build".
                ($diffopt eq '--exit-code' ? "" :