git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: "Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>,
	"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH] tests: test applying criss-cross rename patch
Date: Tue, 21 Apr 2009 00:08:01 -0700	[thread overview]
Message-ID: <7viqkya3hq.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <81b0412b0904200711p66ea2500s7cc5894aba71f641@mail.gmail.com> (Alex Riesen's message of "Mon, 20 Apr 2009 16:11:01 +0200")

Alex Riesen <raa.lkml@gmail.com> writes:

> 2009/4/11 Michał Kiedrowicz <michal.kiedrowicz@gmail.com>:
>> +test_expect_success 'criss-cross rename' '
>> +       mv file1 tmp &&
>> +       mv file2 file1 &&
>> +       mv tmp file2
>> +'
>> +
>> +test_expect_success 'diff -M -B' '
>> +       git diff -M -B > diff &&
>> +       git reset --hard
>> +
>> +'
>
> This cannot work on systems where ctime is not trusted:
> git diff will produce no data, as there are no changes in
> metadata (the files are of the same size). Either make
> the file sizes different or add a "touch file1 file2".

You seem to be saying that we still have a racy-git bug somewhere.  Is
your statement from an actual experience or a speculation?  If the former
we have a bug to kill, not a workaround to avoid the issue in this test.

>
> diff --git a/t/t4130-apply-criss-cross-rename.sh
> b/t/t4130-apply-criss-cross-rename.sh
> index 8623dbe..1ff049a 100755
> --- a/t/t4130-apply-criss-cross-rename.sh
> +++ b/t/t4130-apply-criss-cross-rename.sh
> @@ -14,7 +14,7 @@ create_file() {
>
>  test_expect_success 'setup' '
>  	create_file file1 "File1 contents" &&
> -	create_file file2 "File2 contents" &&
> +	create_file file2 "Contents of File2" &&
>  	git add file1 file2 &&
>  	git commit -m 1
>  '

  reply	other threads:[~2009-04-21  7:09 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-09 18:59 buglet: 'git apply' doesn't handle criss-cross renames Linus Torvalds
2009-04-11 15:26 ` [PATCH] tests: test applying criss-cross rename patch Michał Kiedrowicz
2009-04-13 16:47   ` Junio C Hamano
2009-04-13 19:28     ` Junio C Hamano
2009-04-20 14:11   ` Alex Riesen
2009-04-21  7:08     ` Junio C Hamano [this message]
2009-04-21 12:41       ` Alex Riesen

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=7viqkya3hq.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=michal.kiedrowicz@gmail.com \
    --cc=raa.lkml@gmail.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).