diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:33 -0700 |
| commit | 3819fb9ab4c80e5fea3a7b31703a3884f47c8a83 (patch) | |
| tree | dc27a1922cf29e845dccc4bdfe00fa03025d4fe0 /t | |
| parent | Tenth batch for 2.10 (diff) | |
| parent | t4130: work around Windows limitation (diff) | |
| download | tgif-3819fb9ab4c80e5fea3a7b31703a3884f47c8a83.tar.xz | |
Merge branch 'js/t4130-rename-without-ino'
Windows port was failing some tests in t4130, due to the lack of
inum in the returned values by its lstat(2) emulation.
* js/t4130-rename-without-ino:
t4130: work around Windows limitation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4130-apply-criss-cross-rename.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh index d173acde0f..f8a313bcb9 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 ' |