mirror of
https://github.com/git/git.git
synced 2024-05-20 22:46:27 +02:00
54956df9bc
On Windows, it is already pretty expensive to try to recreate the stat() data that Git assumes is cheap to obtain. To make things halfway decent in performance, we even have to skip emulating the inode and to determine the number of hard links. This is not a huge problem, usually, as either the size or the mtime or the ctime are tell-tale enough to say when a file has changed, and even if not, those changes are typically made after the index file was written, triggering a rehashing of the files' contents. The t4130-apply-criss-cross-rename test case, however, requires the inode to determine that files of equal size were swapped, as renaming files does not update their mtime. Every once in a while, t4130 fails on Windows because of this missing piece. Equal file sizes are not crucial for the test cases, however. Hence, generate files with different sizes so that there is some property that the swapped files can be discovered reliably even on Windows. Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
1.4 KiB
Bash
Executable File
71 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git apply handling criss-cross rename patch.'
|
|
. ./test-lib.sh
|
|
|
|
create_file() {
|
|
cnt=0
|
|
while test $cnt -le 100
|
|
do
|
|
cnt=$(($cnt + 1))
|
|
echo "$2" >> "$1"
|
|
done
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
# 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
|
|
'
|
|
|
|
test_expect_success 'criss-cross rename' '
|
|
mv file1 tmp &&
|
|
mv file2 file1 &&
|
|
mv tmp file2 &&
|
|
cp file1 file1-swapped &&
|
|
cp file2 file2-swapped
|
|
'
|
|
|
|
test_expect_success 'diff -M -B' '
|
|
git diff -M -B > diff &&
|
|
git reset --hard
|
|
|
|
'
|
|
|
|
test_expect_success 'apply' '
|
|
git apply diff &&
|
|
test_cmp file1 file1-swapped &&
|
|
test_cmp file2 file2-swapped
|
|
'
|
|
|
|
test_expect_success 'criss-cross rename' '
|
|
git reset --hard &&
|
|
mv file1 tmp &&
|
|
mv file2 file1 &&
|
|
mv file3 file2 &&
|
|
mv tmp file3 &&
|
|
cp file1 file1-swapped &&
|
|
cp file2 file2-swapped &&
|
|
cp file3 file3-swapped
|
|
'
|
|
|
|
test_expect_success 'diff -M -B' '
|
|
git diff -M -B > diff &&
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'apply' '
|
|
git apply diff &&
|
|
test_cmp file1 file1-swapped &&
|
|
test_cmp file2 file2-swapped &&
|
|
test_cmp file3 file3-swapped
|
|
'
|
|
|
|
test_done
|