git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision
Date: Sat, 24 Aug 2013 23:16:49 -0700	[thread overview]
Message-ID: <20130825061649.GS2882@elie.Belkin> (raw)
In-Reply-To: <1377303042-50868-3-git-send-email-sunshine@sunshineco.com>

Eric Sunshine wrote:

> --- 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 ...
	)

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

Likewise.

Thanks,
Jonathan

  reply	other threads:[~2013-08-25  6:16 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-24  0:10 [PATCH v2 0/3] fix interactive rebase short SHA-1 collision bug Eric Sunshine
2013-08-24  0:10 ` [PATCH v2 1/3] t3404: make tests more self-contained Eric Sunshine
2013-08-24  0:10 ` [PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision Eric Sunshine
2013-08-25  6:16   ` Jonathan Nieder [this message]
2013-08-24  0:10 ` [PATCH v2 3/3] rebase -i: fix " Eric Sunshine
2013-08-26  7:19 ` [PATCH v2 0/3] fix interactive rebase short SHA-1 collision bug Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130825061649.GS2882@elie.Belkin \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).