Re: [PATCH 06/16] t/t5505-remote: test url-with-# in branches-file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes:

> Add one more test similar to "migrate a remote from named file in
> $GIT_DIR/branches" to check that a url with a # can be used to specify
> the branch name (as opposed to the constant "master").
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
> ---
>  t/t5505-remote.sh | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index fd0a81e..93e11c8 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -702,27 +702,42 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
>  	)
>  '
>  
> -test_expect_success 'remote prune to cause a dangling symref' '
> +test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)' '
>  	git clone one seven &&
> +	origin_url=$(pwd)/one &&

The variable assigned here does not seem to get used.  Is this needed?

> +	(
> +		cd seven &&
> +		git remote rm origin &&
> +		echo "quux#foom" > .git/branches/origin &&
> +		git remote rename origin origin &&
> +		test_path_is_missing .git/branches/origin &&
> +		test "$(git config remote.origin.url)" = "quux" &&
> +		test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin"
> +		test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
> +	)
> +'
> +
> +test_expect_success 'remote prune to cause a dangling symref' '
> +	git clone one eight &&
>  	(
>  		cd one &&
>  		git checkout side2 &&
>  		git branch -D master
>  	) &&
>  	(
> -		cd seven &&
> +		cd eight &&
>  		git remote prune origin
>  	) >err 2>&1 &&
>  	test_i18ngrep "has become dangling" err &&
>  
>  	: And the dangling symref will not cause other annoying errors &&
>  	(
> -		cd seven &&
> +		cd eight &&
>  		git branch -a
>  	) 2>err &&
>  	! grep "points nowhere" err &&
>  	(
> -		cd seven &&
> +		cd eight &&
>  		test_must_fail git branch nomore origin
>  	) 2>err &&
>  	grep "dangling symref" err
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]