Re: [PATCH v3 1/1] Add another option for receive.denyCurrentBranch

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 13, 2014, 17:51 UTC
Message-ID: <xmqq7fyz2dlj.fsf@gitster.dls.corp.google.com>
In-Reply-To: <7bd583cb3c7097811cff81cada9720eb30c3585e.1415876330.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

Show 25 quoted lines

> diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
> index f4da20a..ba002a9 100755
> --- a/t/t5516-fetch-push.sh
> +++ b/t/t5516-fetch-push.sh
> @@ -1330,4 +1330,21 @@ test_expect_success 'fetch into bare respects core.logallrefupdates' '
>  	)
>  '
>  
> +test_expect_success 'receive.denyCurrentBranch = updateInstead' '
> +	git push testrepo master &&
> +	(cd testrepo &&
> +		git reset --hard &&
> +		git config receive.denyCurrentBranch updateInstead
> +	) &&
> +	test_commit third path2 &&
> +	git push testrepo master &&
> +	test $(git rev-parse HEAD) = $(cd testrepo && git rev-parse HEAD) &&
> +	test third = "$(cat testrepo/path2)" &&
> +	(cd testrepo &&
> +		git update-index --refresh &&
> +		git diff-files --quiet &&
> +		git diff-index --cached HEAD --
> +	)
> +'
> +

This new feature has two sides. Update when we can and more importantly fail the update safely. This tests the "success" case, but not the "safely fail" one.

For the latter "test_must_fail git push" on the sending side, and "original HEAD stays the same and the working tree changes are preserved when there are local changes before the push" on the receiving side needs to be tested.

Thanks.