Ramkumar Ramachandra <artag...@gmail.com> writes:

> Four tests exercising fetch and push functionality unnecessarily depend
> on $GIT_DIR/branches files.  Modern Git does not encourage the use of
> those files, and the parser remote.c:read_branches_file() is only
> provided for backward compatibility with older repositories.  We already
> have tests in t/t5505-remote to verify that the parser works: so,
> substitute the $GIT_DIR/branches configuration with an equivalent
> gitconfig-style configuration, using the results of those tests.

As we are not deprecating, I think we agree we would prefer to keep
these working.  If we need tests using remotes/ or config, they
should be added as their own tests, not by removing branches/ one.

>
> Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
> ---
>  t/t5516-fetch-push.sh | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
> index 4691d51..6e9fa84 100755
> --- a/t/t5516-fetch-push.sh
> +++ b/t/t5516-fetch-push.sh
> @@ -852,9 +852,11 @@ test_expect_success 'fetch with branches' '
>       mk_empty testrepo &&
>       git branch second $the_first_commit &&
>       git checkout second &&
> -     echo ".." > testrepo/.git/branches/branch1 &&
>       (
>               cd testrepo &&
> +             test_config remote.branch1.url ".."  &&
> +             test_config remote.branch1.fetch 
> "refs/heads/master:refs/heads/branch1"  &&
> +             test_config remote.branch1.push "HEAD:refs/heads/master"  &&
>               git fetch branch1 &&
>               echo "$the_commit commit        refs/heads/branch1" >expect &&
>               git for-each-ref refs/heads >actual &&
> @@ -865,9 +867,11 @@ test_expect_success 'fetch with branches' '
>  
>  test_expect_success 'fetch with branches containing #' '
>       mk_empty testrepo &&
> -     echo "..#second" > testrepo/.git/branches/branch2 &&
>       (
>               cd testrepo &&
> +             test_config remote.branch2.url ".."  &&
> +             test_config remote.branch2.fetch 
> "refs/heads/second:refs/heads/branch2"  &&
> +             test_config remote.branch2.push "HEAD:refs/heads/second"  &&
>               git fetch branch2 &&
>               echo "$the_first_commit commit  refs/heads/branch2" >expect &&
>               git for-each-ref refs/heads >actual &&
> @@ -879,7 +883,9 @@ test_expect_success 'fetch with branches containing #' '
>  test_expect_success 'push with branches' '
>       mk_empty testrepo &&
>       git checkout second &&
> -     echo "testrepo" > .git/branches/branch1 &&
> +     test_config remote.branch1.url testrepo &&
> +     test_config remote.branch1.fetch "refs/heads/master:refs/heads/branch1" 
> &&
> +     test_config remote.branch1.push "HEAD:refs/heads/master" &&
>       git push branch1 &&
>       (
>               cd testrepo &&
> @@ -891,7 +897,9 @@ test_expect_success 'push with branches' '
>  
>  test_expect_success 'push with branches containing #' '
>       mk_empty testrepo &&
> -     echo "testrepo#branch3" > .git/branches/branch2 &&
> +     test_config remote.branch2.url testrepo &&
> +     test_config remote.branch2.fetch 
> "refs/heads/branch3:refs/heads/branch2" &&
> +     test_config remote.branch2.push "HEAD:refs/heads/branch3" &&
>       git push branch2 &&
>       (
>               cd testrepo &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to