All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
	Thomas Rast <trast@inf.ethz.ch>, Johannes Sixt <j6t@kdbg.org>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH v4 03/11] t6050-replace: test that objects are of the same type
Date: Wed, 04 Sep 2013 13:39:58 -0700	[thread overview]
Message-ID: <xmqqa9jsmich.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20130903071026.29838.76131.chriscool@tuxfamily.org> (Christian Couder's message of "Tue, 03 Sep 2013 09:10:17 +0200")

Christian Couder <chriscool@tuxfamily.org> writes:

> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  t/t6050-replace.sh | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
> index decdc33..5c352c4 100755
> --- a/t/t6050-replace.sh
> +++ b/t/t6050-replace.sh
> @@ -263,4 +263,17 @@ test_expect_success 'not just commits' '
>  	test_cmp file.replaced file
>  '
>  
> +test_expect_success 'replaced and replacement objects must be of the same type' '
> +	test_must_fail git replace mytag $HASH1 2>err &&
> +	grep "mytag. points to a replaced object of type .tag" err &&
> +	grep "$HASH1. points to a replacement object of type .commit" err &&

Hmm, would these messages ever get translated?  I think it is
sufficient to make sure that the proposed replacement fails for
these cases.

> +	test_must_fail git replace HEAD^{tree} HEAD~1 2>err &&
> +	grep "HEAD^{tree}. points to a replaced object of type .tree" err &&
> +	grep "HEAD~1. points to a replacement object of type .commit" err &&
> +	BLOB=$(git rev-parse :file) &&
> +	test_must_fail git replace HEAD^ $BLOB 2>err &&
> +	grep "HEAD^. points to a replaced object of type .commit" err &&
> +	grep "$BLOB. points to a replacement object of type .blob" err
> +'
> +
>  test_done

  reply	other threads:[~2013-09-04 20:40 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-03  7:10 [PATCH v4 00/11] Check replacement object type and minor updates Christian Couder
2013-09-03  7:10 ` [PATCH v4 01/11] replace: forbid replacing an object with one of a different type Christian Couder
2013-09-03  7:10 ` [PATCH v4 02/11] Documentation/replace: state that objects must be of the same type Christian Couder
2013-09-03  7:10 ` [PATCH v4 03/11] t6050-replace: test that objects are " Christian Couder
2013-09-04 20:39   ` Junio C Hamano [this message]
2013-09-05 19:13     ` Christian Couder
2013-09-03  7:10 ` [PATCH v4 04/11] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-09-03  7:10 ` [PATCH v4 05/11] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-09-03  7:10 ` [PATCH v4 06/11] replace: bypass the type check if -f option is used Christian Couder
2013-09-04 20:44   ` Junio C Hamano
2013-09-05 12:56     ` Christian Couder
2013-09-03  7:10 ` [PATCH v4 07/11] Documentation/replace: tell that -f option bypasses the type check Christian Couder
2013-09-04 20:45   ` Junio C Hamano
2013-09-04 20:48   ` Junio C Hamano
2013-09-03  7:10 ` [PATCH v4 08/11] t6050-replace: check " Christian Couder
2013-09-03  7:10 ` [PATCH v4 09/11] replace: allow long option names Christian Couder
2013-09-03  7:10 ` [PATCH v4 10/11] Documentation/replace: list " Christian Couder
2013-09-04 20:45   ` Junio C Hamano
2013-09-05 13:03     ` Christian Couder
2013-09-03  7:10 ` [PATCH v4 11/11] t6050-replace: use some " Christian Couder

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=xmqqa9jsmich.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=jrnieder@gmail.com \
    --cc=philipoakley@iee.org \
    --cc=sunshine@sunshineco.com \
    --cc=trast@inf.ethz.ch \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.