2009/4/11 Michał Kiedrowicz <michal.kiedrowicz@xxxxxxxxx>:
> +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
'
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html