From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2] t4130: work around Windows limitation
Date: Wed, 03 Aug 2016 08:50:28 -0700 [thread overview]
Message-ID: <xmqq4m71c0mz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <244e3458-4a41-49bf-fba2-71da872e7f66@kdbg.org> (Johannes Sixt's message of "Wed, 3 Aug 2016 08:15:03 +0200")
Johannes Sixt <j6t@kdbg.org> writes:
> This fell through the cracks, I think. I marked it as v2 because
> there is a minor fixup in the commit message.
Thanks. The patch itself seems to got whitespace damaged somewhere
between you and me, which I fixed up, but there may be similar
damage to the proposed log message as well. What I read may already
have whitespace damaged but I read the message twice and it made
sense to me, so let's assume all is well ;-)
Thanks.
>
> t/t4130-apply-criss-cross-rename.sh | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
> index d173acd..f8a313b 100755
> --- a/t/t4130-apply-criss-cross-rename.sh
> +++ b/t/t4130-apply-criss-cross-rename.sh
> @@ -13,9 +13,13 @@ create_file() {
> }
> test_expect_success 'setup' '
> - create_file file1 "File1 contents" &&
> - create_file file2 "File2 contents" &&
> - create_file file3 "File3 contents" &&
> + # Ensure that file sizes are different, because on Windows
> + # lstat() does not discover inode numbers, and we need
> + # other properties to discover swapped files
> + # (mtime is not always different, either).
> + create_file file1 "some content" &&
> + create_file file2 "some other content" &&
> + create_file file3 "again something else" &&
> git add file1 file2 file3 &&
> git commit -m 1
> '
next prev parent reply other threads:[~2016-08-03 16:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-27 12:39 [PATCH] t4130: work around Windows limitation Johannes Schindelin
2016-07-27 16:37 ` Johannes Sixt
2016-07-27 16:40 ` Junio C Hamano
2016-07-30 8:11 ` Johannes Schindelin
2016-08-03 6:15 ` [PATCH v2] " Johannes Sixt
2016-08-03 12:03 ` Johannes Schindelin
2016-08-03 15:50 ` Junio C Hamano [this message]
2016-08-04 5:31 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4m71c0mz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).