Johannes Sixt <[email protected]> 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
> '
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
