From: Steffen Prohaska Date: Thu, 15 May 2008 05:19:54 +0000 (+0200) Subject: t0050: Fix merge test on case sensitive file systems X-Git-Tag: v1.5.6-rc0~23^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0047dd2fd1fc1980913901c5fa098357482c2842;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 0e33c4bdc..c5360e23d 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -72,6 +72,8 @@ $test_case 'rename (case change)' ' $test_case 'merge (case change)' ' + rm -f CamelCase && + rm -f camelcase && git reset --hard initial && git merge topic