X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debpush;h=bd0357b5dc3a301979297023efc67dce5fb727e3;hb=f6f6419eca67882b47632875d2ee7163f4d005c7;hp=beb24fbf2ba7b421ede799540d445bd40adb6ce9;hpb=c692a79177069b52731bba1d3c495e521b6e4449;p=dgit.git diff --git a/git-debpush b/git-debpush index beb24fbf..bd0357b5 100755 --- a/git-debpush +++ b/git-debpush @@ -105,10 +105,15 @@ check_treesame () { shift 2 set +e - git diff --exit-code "$first".."$second" -- . "$@" + git diff --quiet --exit-code "$first".."$second" -- . "$@" git_diff_rc=$? set -e + # show the user what the difference was + if [ $git_diff_rc = 1 ]; then + git diff --compact-summary "$first".."$second" -- . "$@" + fi + if [ $git_diff_rc -le 1 ]; then return $git_diff_rc else