threads / patch / 31952

patchFix t9200 on case insensitive file systems

Subject: [PATCH] Fix t9200 on case insensitive file systems

## tl;dr

4 messages between Oct 26, 2012 and Oct 28, 2012. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Torsten Bögershausen· Oct 26, 2012, 16:18 UTC · lore

t9200 defines $CVSROOT where cvs should init its repository $CVSROOT is set to $PWD/cvsroot. cvs init is supposed to create the repository inside $PWD/cvsroot/CVSROOT

"cvs init" (e.g. version 1.11.23) checks if the last element of the path is "CVSROOT", and if a directory with e.g. $PWD/cvsroot/CVSROOT already exists.

For such a $CVSROOT cvs refuses to init a repository here: "Cannot initialize repository under existing CVSROOT:

On a case insenstive file system cvsroot and CVSROOT are the same directories and t9200 fails.

Solution: use $PWD/tmp/cvsroot instead of cvsroot $PWD/cvsroot
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
 t/t9200-git-cvsexportcommit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to t/t9200-git-cvsexportcommit.sh +1 −1
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index b59be9a..69934b2 100755
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -19,7 +19,7 @@ then
     test_done
 fi
 
-CVSROOT=$PWD/cvsroot
+CVSROOT=$PWD/tmpcvsroot
 CVSWORK=$PWD/cvswork
 GIT_DIR=$PWD/.git
 export CVSROOT CVSWORK GIT_DIR
-- 
1.7.12
Ben Walton· Oct 27, 2012, 21:36 UTC · re: Torsten Bögershausen · lore

Re: [PATCH] Fix t9200 on case insensitive file systems

On Fri, Oct 26, 2012 at 5:18 PM, Torsten Bögershausen <tboegi@web.de> wrote:
Show 13 quoted lines
>  t/t9200-git-cvsexportcommit.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
> index b59be9a..69934b2 100755
> --- a/t/t9200-git-cvsexportcommit.sh
> +++ b/t/t9200-git-cvsexportcommit.sh
> @@ -19,7 +19,7 @@ then
>      test_done
>  fi
>
> -CVSROOT=$PWD/cvsroot
> +CVSROOT=$PWD/tmpcvsroot

FWIW, this looks obviously correct given the code snippet from the cvs version you shared the other day.

Thanks -Ben

-- 
---------------------------------------------------------------------------------------------------------------------------
Take the risk of thinking for yourself.  Much more happiness,
truth, beauty and wisdom will come to you that way.

-Christopher Hitchens
---------------------------------------------------------------------------------------------------------------------------
Jeff King· Oct 28, 2012, 11:10 UTC · re: Torsten Bögershausen · lore

Re: [PATCH] Fix t9200 on case insensitive file systems

On Fri, Oct 26, 2012 at 06:18:24PM +0200, Torsten Bögershausen wrote:
Show 14 quoted lines
> t9200 defines $CVSROOT where cvs should init its repository
> $CVSROOT is set to $PWD/cvsroot.
> cvs init is supposed to create the repository inside $PWD/cvsroot/CVSROOT
> 
> "cvs init" (e.g. version  1.11.23) checks if the last element of the path is
> "CVSROOT", and if a directory with e.g. $PWD/cvsroot/CVSROOT already exists.
> 
> For such a $CVSROOT cvs refuses to init a repository here:
> "Cannot initialize repository under existing CVSROOT:
> 
> On a case insenstive file system cvsroot and CVSROOT are the same directories
> and t9200 fails.
> 
> Solution: use $PWD/tmp/cvsroot instead of cvsroot $PWD/cvsroot

Wouldn't tmp/cvsroot have the same problem, since the basename is still cvsroot?

Show 10 quoted lines
> diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
> index b59be9a..69934b2 100755
> --- a/t/t9200-git-cvsexportcommit.sh
> +++ b/t/t9200-git-cvsexportcommit.sh
> @@ -19,7 +19,7 @@ then
>      test_done
>  fi
>  
> -CVSROOT=$PWD/cvsroot
> +CVSROOT=$PWD/tmpcvsroot

Ah, but here you do something different, which makes sense. Should I tweak the commit message?

-Peff
Torsten Bögershausen· Oct 28, 2012, 15:28 UTC · re: Jeff King · lore

Re: [PATCH] Fix t9200 on case insensitive file systems

On 28.10.12 12:10, Jeff King wrote:
Show 34 quoted lines
> On Fri, Oct 26, 2012 at 06:18:24PM +0200, Torsten Bögershausen wrote:
> 
>> t9200 defines $CVSROOT where cvs should init its repository
>> $CVSROOT is set to $PWD/cvsroot.
>> cvs init is supposed to create the repository inside $PWD/cvsroot/CVSROOT
>>
>> "cvs init" (e.g. version  1.11.23) checks if the last element of the path is
>> "CVSROOT", and if a directory with e.g. $PWD/cvsroot/CVSROOT already exists.
>>
>> For such a $CVSROOT cvs refuses to init a repository here:
>> "Cannot initialize repository under existing CVSROOT:
>>
>> On a case insenstive file system cvsroot and CVSROOT are the same directories
>> and t9200 fails.
>>
>> Solution: use $PWD/tmp/cvsroot instead of cvsroot $PWD/cvsroot
> 
> Wouldn't tmp/cvsroot have the same problem, since the basename is still
> cvsroot?
> 
>> diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
>> index b59be9a..69934b2 100755
>> --- a/t/t9200-git-cvsexportcommit.sh
>> +++ b/t/t9200-git-cvsexportcommit.sh
>> @@ -19,7 +19,7 @@ then
>>      test_done
>>  fi
>>  
>> -CVSROOT=$PWD/cvsroot
>> +CVSROOT=$PWD/tmpcvsroot
> 
> Ah, but here you do something different, which makes sense. Should I
> tweak the commit message?
> 
Yes, please do so.

Thanks for spotting, /torsten

← back to recent threads