Skip to content

Commit 85b2ea2

Browse files
committed
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
2 parents 7b163e9 + 54956df commit 85b2ea2

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

t/t4130-apply-criss-cross-rename.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ create_file() {
1313
}
1414

1515
test_expect_success 'setup' '
16-
create_file file1 "File1 contents" &&
17-
create_file file2 "File2 contents" &&
18-
create_file file3 "File3 contents" &&
16+
# Ensure that file sizes are different, because on Windows
17+
# lstat() does not discover inode numbers, and we need
18+
# other properties to discover swapped files
19+
# (mtime is not always different, either).
20+
create_file file1 "some content" &&
21+
create_file file2 "some other content" &&
22+
create_file file3 "again something else" &&
1923
git add file1 file2 file3 &&
2024
git commit -m 1
2125
'

0 commit comments

Comments
 (0)