Merge branch 'sr/local-config'

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 01f898e57a2197c6fb44b548c66b769af34be567..0b489f5b1227268c050c1256d105d57d871f5698 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -31,7 +31,7 @@ cd "$D"
 test_expect_success 'checking the results' '
        test -f file &&
        test -f cloned/file &&
-       diff file cloned/file
+       test_cmp file cloned/file
 '
 
 test_expect_success 'pulling into void using master:master' '
@@ -186,7 +186,7 @@ test_expect_success 'setup for detecting upstreamed changes' '
        )
 '
 
-test_expect_failure 'git pull --rebase detects upstreamed changes' '
+test_expect_success 'git pull --rebase detects upstreamed changes' '
        (cd dst &&
         git pull --rebase &&
         test -z "$(git ls-files -u)"
@@ -215,7 +215,7 @@ test_expect_success 'setup for avoiding reapplying old patches' '
        )
 '
 
-test_expect_failure 'git pull --rebase does not reapply old patches' '
+test_expect_success 'git pull --rebase does not reapply old patches' '
        (cd dst &&
         test_must_fail git pull --rebase &&
         test 1 = $(find .git/rebase-apply -name "000*" | wc -l)