git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: CVS import [SOLVED]

From
Ferry Huberts (Pelagic) <ferry.huberts@pelagic.nl>
Date
Feb 16, 2009, 17:33 UTC
Message-ID
<4999A378.2040905@pelagic.nl>
In-Reply-To
<alpine.DEB.1.00.0902161451210.6289@intel-tinevez-2-302>
Johannes Schindelin wrote:
Show 64 quoted lines
> Hi,
>
> On Mon, 16 Feb 2009, Johannes Schindelin wrote:
>
>   
>> On Mon, 16 Feb 2009, Ferry Huberts (Pelagic) wrote:
>>
>>     
>>> I solved it:
>>>
>>> it has to do with the
>>> core.autocrlf=input
>>> core.safecrlf=true
>>>
>>> settings I had in my global config.
>>>       
>> Thanks!
>>
>>     
>>> Maybe the manual page should warn against having these defined?
>>>       
>> Maybe it should be solved differently?  As cvsimport needs to operate with 
>> autocrlf=false, it seems, it could set that variable when it creates a 
>> repository, and check the variable otherwise (erroring out if it is set 
>> inappropriately)?
>>     
>
> IOW something like this:
>
> -- snip --
>  git-cvsimport.perl |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/git-cvsimport.perl b/git-cvsimport.perl
> index e439202..a27cc94 100755
> --- a/git-cvsimport.perl
> +++ b/git-cvsimport.perl
> @@ -562,12 +562,16 @@ my %index; # holds filenames of one index per branch
>  unless (-d $git_dir) {
>  	system("git-init");
>  	die "Cannot init the GIT db at $git_tree: $?\n" if $?;
> +	system("git-config core.autocrlf false");
> +	die "Cannot set core.autocrlf false" if $?;
>  	system("git-read-tree");
>  	die "Cannot init an empty tree: $?\n" if $?;
>  
>  	$last_branch = $opt_o;
>  	$orig_branch = "";
>  } else {
> +	die "Cannot operate with core.autocrlf other than 'false'"
> +		if (`git-config --bool core.autocrlf` =~ /true|input/);
>  	open(F, "git-symbolic-ref HEAD |") or
>  		die "Cannot run git-symbolic-ref: $!\n";
>  	chomp ($last_branch = <F>);
> -- snap --
>
> If you could add a test to t9600 and a few words to the man page, that 
> would be awesome.
>
> Ciao,
> Dscho
>
> P.S.: I think the same strategy should be applied to git-svn...
>   

I'm willing to give it a stab but I'm not versed on Perl at all. C and Java I can do without breaking a sweat though. Isn't it a better idea to have the original authors do this? They understand the code. Also, doing this would constitute my first patch to git. I'm unfamiliar with its codebase and the requirements of the people that contribute to it. Willing to learn though :-) My patches would then probably need some review and would take a bit longer to develop. If that's acceptable then I'm willing to try.

Ferry
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 5 of 26 in “CVS import”
  1. Ferry Huberts (Pelagic)Feb 16, 2009
  2. Ferry Huberts (Pelagic)Feb 16, 2009
  3. Johannes SchindelinFeb 16, 2009
  4. Johannes SchindelinFeb 16, 2009
  5. Ferry Huberts (Pelagic)Feb 16, 2009
  6. Johannes SchindelinFeb 16, 2009
  7. Ferry Huberts (Pelagic)Feb 16, 2009
  8. Johannes SchindelinFeb 16, 2009
  9. Ferry Huberts (Pelagic)Feb 17, 2009
  10. Johannes SchindelinFeb 17, 2009
  11. Ferry Huberts (Pelagic)Feb 17, 2009
  12. Jeff KingFeb 20, 2009
  13. Ferry Huberts (Pelagic)Feb 20, 2009
  14. autocrlf=input and safecrlf (was Re: CVS import [SOLVED])Jeff King, Feb 20, 2009
  15. Ferry Huberts (Pelagic)Feb 20, 2009
  16. Jeff KingFeb 23, 2009
  17. Ferry Huberts (Pelagic)Feb 23, 2009
  18. Jeff KingFeb 23, 2009
  19. Ferry Huberts (Pelagic)Feb 23, 2009
  20. Jeff KingFeb 23, 2009
  21. Ferry Huberts (Pelagic)Feb 23, 2009
  22. Jeff KingFeb 24, 2009
  23. Ferry Huberts (Pelagic)Feb 24, 2009
  24. Jeff KingFeb 25, 2009
  25. Ferry Huberts (Pelagic)Feb 25, 2009
  26. Jeff KingFeb 25, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.