chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debpush: check_treesame: Show diffstat when there is a diff
[dgit.git]
/
git-debpush
diff --git
a/git-debpush
b/git-debpush
index beb24fbf2ba7b421ede799540d445bd40adb6ce9..bd0357b5dc3a301979297023efc67dce5fb727e3 100755
(executable)
--- a/
git-debpush
+++ b/
git-debpush
@@
-105,10
+105,15
@@
check_treesame () {
shift 2
set +e
shift 2
set +e
- git diff --exit-code "$first".."$second" -- . "$@"
+ git diff --
quiet --
exit-code "$first".."$second" -- . "$@"
git_diff_rc=$?
set -e
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
if [ $git_diff_rc -le 1 ]; then
return $git_diff_rc
else