{"thread":{"id":"32617","subject":"[PATCH] t0050: mark TC merge (case change) as success","startedAt":"2013-01-13T20:38:36Z","lastAt":"2013-01-14T17:53:34Z","messageCount":3,"participants":["Torsten Bögershausen","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"206713","messageId":"201301132138.37154.tboegi@web.de","threadId":"32617","inReplyTo":null,"subject":"[PATCH] t0050: mark TC merge (case change) as success","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2013-01-13T20:38:36Z","receivedAt":"2013-01-13T20:38:36Z","isPatch":true,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"The test \"merge (case change)\" passes on a case ignoring file system\n\nUse test_expect_success to remove the \"known breakage vanished\"\n\nSigned-off-by: Torsten Bögershausen <tboegi@web.de>\n---\n t/t0050-filesystem.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh\nindex 78816d9..ccd685d 100755\n--- a/t/t0050-filesystem.sh\n+++ b/t/t0050-filesystem.sh\n@@ -77,7 +77,7 @@ $test_case 'rename (case change)' '\n \n '\n \n-$test_case 'merge (case change)' '\n+test_expect_success 'merge (case change)' '\n \n \trm -f CamelCase &&\n \trm -f camelcase &&\n-- \n1.8.0.197.g5a90748\n"},{"id":"206721","messageId":"7v7gnghdj2.fsf@alter.siamese.dyndns.org","threadId":"32617","inReplyTo":"201301132138.37154.tboegi@web.de","subject":"Re: [PATCH] t0050: mark TC merge (case change) as success","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-13T23:24:49Z","receivedAt":"2013-01-13T23:24:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Torsten Bögershausen <tboegi@web.de> writes:\n\n> The test \"merge (case change)\" passes on a case ignoring file system\n>\n> Use test_expect_success to remove the \"known breakage vanished\"\n>\n> Signed-off-by: Torsten Bögershausen <tboegi@web.de>\n> ---\n\nInteresting.  When did this change?  Do you happen to have a\nbisection?  Or did the test pass from the very beginning?\n\n>  t/t0050-filesystem.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh\n> index 78816d9..ccd685d 100755\n> --- a/t/t0050-filesystem.sh\n> +++ b/t/t0050-filesystem.sh\n> @@ -77,7 +77,7 @@ $test_case 'rename (case change)' '\n>  \n>  '\n>  \n> -$test_case 'merge (case change)' '\n> +test_expect_success 'merge (case change)' '\n>  \n>  \trm -f CamelCase &&\n>  \trm -f camelcase &&\n"},{"id":"206817","messageId":"50F4461E.3060408@web.de","threadId":"32617","inReplyTo":"7v7gnghdj2.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] t0050: mark TC merge (case change) as success","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2013-01-14T17:53:34Z","receivedAt":"2013-01-14T17:53:34Z","isPatch":true,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"On 14.01.13 00:24, Junio C Hamano wrote:\n> Torsten Bögershausen <tboegi@web.de> writes:\n> \n>> The test \"merge (case change)\" passes on a case ignoring file system\n>>\n>> Use test_expect_success to remove the \"known breakage vanished\"\n>>\n>> Signed-off-by: Torsten Bögershausen <tboegi@web.de>\n>> ---\n> \n> Interesting.  When did this change?  Do you happen to have a\n> bisection?  \nThis seems to be the commit:\n\ncommit 6aad47dec7a72bb36c64afb6c43f4dbcaa49e7f9\nMerge: e13067a 0047dd2\nAuthor: Junio C Hamano <gitster@pobox.com>\nDate:   Fri May 23 16:05:52 2008 -0700\n\n    Merge branch 'sp/ignorecase'\n    \n    * sp/ignorecase:\n      t0050: Fix merge test on case sensitive file systems\n      t0050: Add test for case insensitive add\n      t0050: Set core.ignorecase case to activate case insensitivity\n      t0050: Test autodetect core.ignorecase\n      git-init: autodetect core.ignorecase\n\nWhich comes from here:\n\ncommit 0047dd2fd1fc1980913901c5fa098357482c2842\nAuthor: Steffen Prohaska <prohaska@zib.de>\nDate:   Thu May 15 07:19:54 2008 +0200\n\n    t0050: Fix merge test on case sensitive file systems\n    \n    On a case sensitive filesystem, \"git reset --hard\" might refuse to\n    overwrite a file whose name differs only by case, even if\n    core.ignorecase is set.  It is not clear which circumstances cause this\n    behavior.  This commit simply works around the problem by removing\n    the case changing file before running \"git reset --hard\".\n    \n    Signed-off-by: Steffen Prohaska <prohaska@zib.de>\n    Signed-off-by: Junio C Hamano <gitster@pobox.com>\n\n===========\n\n>Or did the test pass from the very beginning?\nHm, reading the commit, it seems as if the \"root problem\" still exist:\ngit reset --hard does not change the case of an existing file\n\nWhat is the exist behvior?\n\n\n\nMy feeling is that the test as such deserves some more improvements,\nthe result of the merge is not checked, files are empty so that\nthe content is not checked.\n\nAnother improvement:\nRunning under Linux gives:\nnot ok 6 - add (with different case) # TODO known breakage\n(and running under mingw failes)\n \nPlease stay tuned for more updates, thanks for reviewing.\n/Torsten\n"}]}