-ours=`git-rev-parse --verify "$ours_symbolic^` || exit
-test "$(git-diff-cache --cached "$ours")" = "" ||
+ours=`git-rev-parse --verify "$ours_symbolic"` || exit
+different1=$(git-diff-cache --name-only --cached "$ours") &&
+different2=$(git-diff-cache --name-only "$ours") &&
+test "$different1$different2" = "" ||