Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 2b6b6e3f71613d807aa4ebfa48eebe5f73d2b980..68c2ae688c2b7ff96ec927622f92fd512e7beefe 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -110,7 +110,7 @@ test_expect_success \
        cd .. &&
        git update-ref refs/heads/master master^ || return 1
        git-send-pack --force ./victim/.git/ master && return 1
-       ! git diff .git/refs/heads/master victim/.git/refs/heads/master
+       ! test_cmp .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_expect_success \