Re: [PATCH] tests: test applying criss-cross rename patch
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- Apr 20, 2009, 14:11 UTC
- Message-ID
- <81b0412b0904200711p66ea2500s7cc5894aba71f641@mail.gmail.com>
- In-Reply-To
- <1239463584-1427-1-git-send-email-michal.kiedrowicz@gmail.com>
2009/4/11 Michał Kiedrowicz <michal.kiedrowicz@gmail.com>:
Show 11 quoted lines
> +test_expect_success 'criss-cross rename' ' > + mv file1 tmp && > + mv file2 file1 && > + mv tmp file2 > +' > + > +test_expect_success 'diff -M -B' ' > + git diff -M -B > diff && > + git reset --hard > + > +'
This cannot work on systems where ctime is not trusted: git diff will produce no data, as there are no changes in metadata (the files are of the same size). Either make the file sizes different or add a "touch file1 file2".
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh index 8623dbe..1ff049a 100755 --- a/t/t4130-apply-criss-cross-rename.sh +++ b/t/t4130-apply-criss-cross-rename.sh @@ -14,7 +14,7 @@ create_file() { test_expect_success 'setup' ' create_file file1 "File1 contents" && - create_file file2 "File2 contents" && + create_file file2 "Contents of File2" && git add file1 file2 && git commit -m 1 '