Re: [PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 25, 2013, 06:16 UTC
Message-ID: <20130825061649.GS2882@elie.Belkin>
In-Reply-To: <1377303042-50868-3-git-send-email-sunshine@sunshineco.com>

Eric Sunshine wrote:

Show 16 quoted lines

> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -1037,4 +1037,28 @@ test_expect_success 'rebase -i with --strategy and -X' '
>  	test $(cat file1) = Z
>  '
>  
> +test_expect_success 'short SHA-1 setup' '
> +	test_when_finished "git checkout master" &&
> +	git checkout --orphan collide &&
> +	git rm -rf . &&
> +	(
> +	unset test_tick &&
> +	test_commit collide1 collide &&
> +	test_commit --notick collide2 collide &&
> +	test_commit --notick collide3 collide
> +	)

Style: would be clearer indented:

	(
		unset test_tick &&
		test_commit ...
	)

Show 5 quoted lines

> +test_expect_failure 'short SHA-1 collide' '
> +	test_when_finished "reset_rebase && git checkout master" &&
> +	git checkout collide &&
> +	(
> +	unset test_tick &&

Likewise.

Thanks, Jonathan