Merge branch 'maint'

diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index 86e5b9bc269b3639a882c6652f4d1f66a45121f7..d5db75d826c8584e1d7f0f5ef298021fecd6f055 100755 (executable)
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -4,6 +4,12 @@ test_description='test automatic tag following'
 
 . ./test-lib.sh
 
+case $(uname -s) in
+*MINGW*)
+       say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
+       test_done
+esac
+
 # End state of the repository:
 #
 #         T - tag1          S - tag2
@@ -50,7 +56,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '
        ) &&
        test -s $U &&
        cut -d" " -f1,2 $U >actual &&
-       git diff expect actual
+       test_cmp expect actual
 '
 
 test_expect_success "create tag T on A, create C on branch cat" '
@@ -82,7 +88,7 @@ test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
        ) &&
        test -s $U &&
        cut -d" " -f1,2 $U >actual &&
-       git diff expect actual
+       test_cmp expect actual
 '
 
 test_expect_success "create commits O, B, tag S on B" '
@@ -118,7 +124,7 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
        ) &&
        test -s $U &&
        cut -d" " -f1,2 $U >actual &&
-       git diff expect actual
+       test_cmp expect actual
 '
 
 cat - <<EOF >expect
@@ -144,7 +150,7 @@ test_expect_success 'new clone fetch master and tags' '
        ) &&
        test -s $U &&
        cut -d" " -f1,2 $U >actual &&
-       git diff expect actual
+       test_cmp expect actual
 '
 
 test_done