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

> Since we plan to edit the test "migrate a remote from named file in
> $GIT_DIR/remotes" in later patches, modernize the subshell-style by
> putting the parenthesis on separate lines and indenting the body.
>
> Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
> ---

Good, but a "style only" patch like this should consider taking
advantage of the occasion to clean up the entire file, as we do not
often get enough chance to do so without conflicting with in-flight
topics.  Is there something else that would conflict if this step
did so?

>  t/t5505-remote.sh | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index dd10ff0..4d5810f 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -691,13 +691,15 @@ test_expect_success 'migrate a remote from named file 
> in $GIT_DIR/remotes' '
>  test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
>       git clone one six &&
>       origin_url=$(pwd)/one &&
> -     (cd six &&
> -      git remote rm origin &&
> -      echo "$origin_url" > .git/branches/origin &&
> -      git remote rename origin origin &&
> -      ! test -f .git/branches/origin &&
> -      test "$(git config remote.origin.url)" = "$origin_url" &&
> -      test "$(git config remote.origin.fetch)" = 
> "refs/heads/master:refs/heads/origin")
> +     (
> +             cd six &&
> +             git remote rm origin &&
> +             echo "$origin_url" > .git/branches/origin &&

A SP between > and the filename is still there?

> +             git remote rename origin origin &&
> +             ! test -f .git/branches/origin &&
> +             test "$(git config remote.origin.url)" = "$origin_url" &&
> +             test "$(git config remote.origin.fetch)" = 
> "refs/heads/master:refs/heads/origin"
> +     )
>  '
>  
>  test_expect_success 'remote prune to cause a dangling symref' '
--
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