projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a19aaa) | patch
t0050: Fix merge test on case sensitive file systems
authorSteffen Prohaska <prohaska@zib.de>
Thu, 15 May 2008 05:19:54 +0000 (07:19 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 May 2008 09:43:26 +0000 (02:43 -0700)
commit0047dd2fd1fc1980913901c5fa098357482c2842
tree24511ba1d8a1420678bd92c73e302f67ab732063tree | snapshot
parent8a19aaab6394df2c6138d5b8b1411eb00bfcf442commit | diff
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>
t/t0050-filesystem.sh diff | blob | history
Git—the stupid content tracker