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
This commit is contained in:
@ -13,9 +13,13 @@ create_file() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
test_expect_success 'setup' '
|
test_expect_success 'setup' '
|
||||||
create_file file1 "File1 contents" &&
|
# Ensure that file sizes are different, because on Windows
|
||||||
create_file file2 "File2 contents" &&
|
# lstat() does not discover inode numbers, and we need
|
||||||
create_file file3 "File3 contents" &&
|
# 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 add file1 file2 file3 &&
|
||||||
git commit -m 1
|
git commit -m 1
|
||||||
'
|
'
|
||||||
|
Reference in New Issue
Block a user