diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:30 -0700 |
| commit | 85b2ea29e83bc66a25cd44ddb1305ff2e6b985a8 (patch) | |
| tree | ee6f7ca11af55b1db391a5f7147b808473665920 | |
| parent | 7b163e918772736b69252053913ba5ccc24adb4d (diff) | |
| parent | 54956df9bc1b9ba7381a7e2d774336005516c668 (diff) | |
| download | git-85b2ea29e83bc66a25cd44ddb1305ff2e6b985a8.tar.gz git-85b2ea29e83bc66a25cd44ddb1305ff2e6b985a8.tar.xz | |
Merge branch 'js/t4130-rename-without-ino' into maint
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
| -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 d173acde0..f8a313bcb 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 ' |