t0050: Fix merge test on case sensitive file systems
On a case sensitive filesystem, "git reset --hard" might refuse to overwrite a file whose name differs only by case, even if core.ignorecase is set. It is not clear which circumstances cause this behavior. This commit simply works around the problem by removing the case changing file before running "git reset --hard". Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Steffen Prohaska committed
May 15, 2008 at 07:19 UTC
0047dd2fd1fc1980913901c5fa098357482c2842
1 file changed
+2
t/t0050-filesystem.sh
+2
@@ -72,6 +72,8 @@ $test_case 'rename (case change)' '
72
73
$test_case 'merge (case change)' '
74
75
+ rm -f CamelCase &&
76
+ rm -f camelcase &&
77
git reset --hard initial &&
78
git merge topic
79