From 0efc9955c6c355f5dd6e98c8097bd3938beb49d1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 3 Aug 2014 18:00:55 +0100 Subject: Do not spew diff output to terminal (by default). Print sensible message instead. Closes:#736526. --- debian/changelog | 3 ++- dgit | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0f2eb9..47ce6c2 100644 --- 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 1fdca6c..843c7ec 100755 --- 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' ? "" : -- cgit v1.2.3