Merge branch 'jk/run-command-eacces' into maint

diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 5c546c99a58854ae0f430e469dad525af52e9292..6764d511ce08cf62da2c257bf5fe50cabaf2f03c 100755 (executable)
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -5,7 +5,6 @@ test_description='git ls-remote'
 . ./test-lib.sh
 
 test_expect_success setup '
-
        >file &&
        git add file &&
        test_tick &&
@@ -18,45 +17,33 @@ test_expect_success setup '
        ) >expected.all &&
 
        git remote add self "$(pwd)/.git"
-
 '
 
 test_expect_success 'ls-remote --tags .git' '
-
        git ls-remote --tags .git >actual &&
        test_cmp expected.tag actual
-
 '
 
 test_expect_success 'ls-remote .git' '
-
        git ls-remote .git >actual &&
        test_cmp expected.all actual
-
 '
 
 test_expect_success 'ls-remote --tags self' '
-
        git ls-remote --tags self >actual &&
        test_cmp expected.tag actual
-
 '
 
 test_expect_success 'ls-remote self' '
-
        git ls-remote self >actual &&
        test_cmp expected.all actual
-
 '
 
 test_expect_success 'dies when no remote specified and no default remotes found' '
-
        test_must_fail git ls-remote
-
 '
 
 test_expect_success 'use "origin" when no remote specified' '
-
        URL="$(pwd)/.git" &&
        echo "From $URL" >exp_err &&
 
@@ -65,18 +52,14 @@ test_expect_success 'use "origin" when no remote specified' '
 
        test_cmp exp_err actual_err &&
        test_cmp expected.all actual
-
 '
 
 test_expect_success 'suppress "From <url>" with -q' '
-
        git ls-remote -q 2>actual_err &&
        test_must_fail test_cmp exp_err actual_err
-
 '
 
 test_expect_success 'use branch.<name>.remote if possible' '
-
        #
        # Test that we are indeed using branch.<name>.remote, not "origin", even
        # though the "origin" remote has been set.
@@ -99,14 +82,13 @@ test_expect_success 'use branch.<name>.remote if possible' '
        git ls-remote 2>actual_err >actual &&
        test_cmp exp_err actual_err &&
        test_cmp exp actual
-
 '
 
-cat >exp <<EOF
-fatal: 'refs*master' does not appear to be a git repository
-fatal: The remote end hung up unexpectedly
-EOF
 test_expect_success 'confuses pattern as remote when no remote specified' '
+       cat >exp <<-\EOF &&
+       fatal: '\''refs*master'\'' does not appear to be a git repository
+       fatal: The remote end hung up unexpectedly
+       EOF
        #
        # Do not expect "git ls-remote <pattern>" to work; ls-remote, correctly,
        # confuses <pattern> for <remote>. Although ugly, this behaviour is akin
@@ -120,7 +102,6 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
        # role as a pattern.
        test_must_fail git ls-remote refs*master >actual 2>&1 &&
        test_cmp exp actual
-
 '
 
 test_expect_success 'die with non-2 for wrong repository even with --exit-code' '