On Wed, 14 May 2008, Junio C Hamano wrote: > > For 1.5.6. > > * sp/ignorecase (Sun May 11 18:16:42 2008 +0200) 4 commits > - t0050: Add test for case insensitive add > - t0050: Set core.ignorecase case to activate case insensitivity > - t0050: Test autodetect core.ignorecase > - git-init: autodetect core.ignorecase > > This unfortunately seems to break on natively case sensitive filesystems. >From 92ec8c8a12cdc45a69f6612af340a8ce50976ab1 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska <prohaska@xxxxxx> Date: Thu, 15 May 2008 07:19:54 +0200 Subject: [PATCH] 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@xxxxxx> --- t/t0050-filesystem.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 0e33c4b..c5360e2 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 -- 1.5.5.1.349.g99d0 -- 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
