Re: [PATCH] t0050: mark TC merge (case change) as success
On 14.01.13 00:24, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: The test merge (case change) passes on a case ignoring file system Use test_expect_success to remove the known breakage vanished Signed-off-by: Torsten Bögershausen tbo...@web.de --- Interesting. When did this change? Do you happen to have a bisection? This seems to be the commit: commit 6aad47dec7a72bb36c64afb6c43f4dbcaa49e7f9 Merge: e13067a 0047dd2 Author: Junio C Hamano gits...@pobox.com Date: Fri May 23 16:05:52 2008 -0700 Merge branch 'sp/ignorecase' * sp/ignorecase: t0050: Fix merge test on case sensitive file systems 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 Which comes from here: commit 0047dd2fd1fc1980913901c5fa098357482c2842 Author: Steffen Prohaska proha...@zib.de Date: Thu May 15 07:19:54 2008 +0200 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 proha...@zib.de Signed-off-by: Junio C Hamano gits...@pobox.com === Or did the test pass from the very beginning? Hm, reading the commit, it seems as if the root problem still exist: git reset --hard does not change the case of an existing file What is the exist behvior? My feeling is that the test as such deserves some more improvements, the result of the merge is not checked, files are empty so that the content is not checked. Another improvement: Running under Linux gives: not ok 6 - add (with different case) # TODO known breakage (and running under mingw failes) Please stay tuned for more updates, thanks for reviewing. /Torsten -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] t0050: mark TC merge (case change) as success
The test merge (case change) passes on a case ignoring file system Use test_expect_success to remove the known breakage vanished Signed-off-by: Torsten Bögershausen tbo...@web.de --- t/t0050-filesystem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 78816d9..ccd685d 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -77,7 +77,7 @@ $test_case 'rename (case change)' ' ' -$test_case 'merge (case change)' ' +test_expect_success 'merge (case change)' ' rm -f CamelCase rm -f camelcase -- 1.8.0.197.g5a90748 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] t0050: mark TC merge (case change) as success
The test merge (case change) passes on a case ignoring file system Use test_expect_success to remove the known breakage vanished Signed-off-by: Torsten Bögershausen tbo...@web.de --- t/t0050-filesystem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 78816d9..ccd685d 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -77,7 +77,7 @@ $test_case 'rename (case change)' ' ' -$test_case 'merge (case change)' ' +test_expect_success 'merge (case change)' ' rm -f CamelCase rm -f camelcase -- 1.8.0.197.g5a90748 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] t0050: mark TC merge (case change) as success
Torsten Bögershausen tbo...@web.de writes: The test merge (case change) passes on a case ignoring file system Use test_expect_success to remove the known breakage vanished Signed-off-by: Torsten Bögershausen tbo...@web.de --- Interesting. When did this change? Do you happen to have a bisection? Or did the test pass from the very beginning? t/t0050-filesystem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 78816d9..ccd685d 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -77,7 +77,7 @@ $test_case 'rename (case change)' ' ' -$test_case 'merge (case change)' ' +test_expect_success 'merge (case change)' ' rm -f CamelCase rm -f camelcase -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
