diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-08-03 18:00:55 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-08-03 18:00:55 +0100 |
commit | 0efc9955c6c355f5dd6e98c8097bd3938beb49d1 (patch) | |
tree | 3b891d96441d16c86d5aaf8dfd573059034c5974 | |
parent | c0fcc7499118fdba35f817ff2f8765b7a1534e2d (diff) |
Do not spew diff output to terminal (by default). Print sensible message instead. Closes:#736526.
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | 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 @@ -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' ? "" : |