* [PATCH] t0050: mark TC merge (case change) as success
@ 2013-01-13 20:38 Torsten Bögershausen
0 siblings, 0 replies; 4+ messages in thread
From: Torsten Bögershausen @ 2013-01-13 20:38 UTC (permalink / raw)
To: git; +Cc: tboegi
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 <tboegi@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] t0050: mark TC merge (case change) as success
@ 2013-01-13 20:38 Torsten Bögershausen
2013-01-13 23:24 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Torsten Bögershausen @ 2013-01-13 20:38 UTC (permalink / raw)
To: git; +Cc: tboegi
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 <tboegi@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] t0050: mark TC merge (case change) as success
2013-01-13 20:38 Torsten Bögershausen
@ 2013-01-13 23:24 ` Junio C Hamano
2013-01-14 17:53 ` Torsten Bögershausen
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2013-01-13 23:24 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
Torsten Bögershausen <tboegi@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 <tboegi@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 &&
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] t0050: mark TC merge (case change) as success
2013-01-13 23:24 ` Junio C Hamano
@ 2013-01-14 17:53 ` Torsten Bögershausen
0 siblings, 0 replies; 4+ messages in thread
From: Torsten Bögershausen @ 2013-01-14 17:53 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Torsten Bögershausen, git, prohaska
On 14.01.13 00:24, Junio C Hamano wrote:
> Torsten Bögershausen <tboegi@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 <tboegi@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 <gitster@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 <prohaska@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 <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-14 17:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-13 20:38 [PATCH] t0050: mark TC merge (case change) as success Torsten Bögershausen
-- strict thread matches above, loose matches on Subject: below --
2013-01-13 20:38 Torsten Bögershausen
2013-01-13 23:24 ` Junio C Hamano
2013-01-14 17:53 ` Torsten Bögershausen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).