remove the impression of unexpectedness when access is denied

diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 3cf1b3da40a8d99631fabaa2cce4ff2b6d1b52ac..2ab66d6e3383097079406d1aeab91737567d2875 100755 (executable)
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -57,12 +57,24 @@ test_expect_success 'dies when no remote specified and no default remotes found'
 
 test_expect_success 'use "origin" when no remote specified' '
 
-       git remote add origin "$(pwd)/.git" &&
-       git ls-remote >actual &&
+       URL="$(pwd)/.git" &&
+       echo "From $URL" >exp_err &&
+
+       git remote add origin "$URL" &&
+       git ls-remote 2>actual_err >actual &&
+
+       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' '
 
        #
@@ -78,28 +90,30 @@ test_expect_success 'use branch.<name>.remote if possible' '
                git show-ref    | sed -e "s/ /  /"
        ) >exp &&
 
-       git remote add other other.git &&
+       URL="other.git" &&
+       echo "From $URL" >exp_err &&
+
+       git remote add other $URL &&
        git config branch.master.remote other &&
 
-       git ls-remote >actual &&
+       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
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
 EOF
 test_expect_success 'confuses pattern as remote when no remote specified' '
        #
-       # Do not expect "git ls-remote <pattern>" to work; ls-remote, correctly,
-       # confuses <pattern> for <remote>. Although ugly, this behaviour is akin
-       # to the confusion of refspecs for remotes by git-fetch and git-push,
-       # eg:
-       #
-       #   $ git fetch branch
-       #
-
+       # Do not expect "git ls-remote <pattern>" to work; ls-remote needs
+       # <remote> if you want to feed <pattern>, just like you cannot say
+       # fetch <branch>.
        # We could just as easily have used "master"; the "*" emphasizes its
        # role as a pattern.
        test_must_fail git ls-remote refs*master >actual 2>&1 &&
@@ -107,4 +121,28 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
 
 '
 
+test_expect_success 'die with non-2 for wrong repository even with --exit-code' '
+       git ls-remote --exit-code ./no-such-repository ;# not &&
+       status=$? &&
+       test $status != 2 && test $status != 0
+'
+
+test_expect_success 'Report success even when nothing matches' '
+       git ls-remote other.git "refs/nsn/*" >actual &&
+       >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'Report no-match with --exit-code' '
+       test_expect_code 2 git ls-remote --exit-code other.git "refs/nsn/*" >actual &&
+       >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'Report match with --exit-code' '
+       git ls-remote --exit-code other.git "refs/tags/*" >actual &&
+       git ls-remote . tags/mark >expect &&
+       test_cmp expect actual
+'
+
 test_done