From: Michael Haggerty Date: Tue, 07 May 2013 03:14:40 GMT Subject: Re: [PATCH 4/4] fast-import: only store commit objects Message-ID: <518871A0.8030707@alum.mit.edu> In-Reply-To: On 05/06/2013 11:36 PM, Felipe Contreras wrote: > This would simplify the documentation, and obliterate the need to use > mark files at all: As explained in my other email, this documentation change does not remove all of the reasons that users might want to use mark files. I would still like to show users how they can load the files into Git as two separate steps. > diff -ur cvs2svn-2.4.0/www/cvs2git.html cvs2svn-2.4.0-mod/www/cvs2git.html > --- cvs2svn-2.4.0/www/cvs2git.html 2012-09-22 01:49:55.000000000 -0500 > +++ cvs2svn-2.4.0-mod/www/cvs2git.html 2013-05-06 16:33:12.070189985 -0500 > @@ -355,14 +355,13 @@ > fast-import:

> >
> -git fast-import --export-marks=../cvs2svn-tmp/git-marks.dat <
> ../cvs2svn-tmp/git-blob.dat
> -git fast-import --import-marks=../cvs2svn-tmp/git-marks.dat <
> ../cvs2svn-tmp/git-dump.dat
> +cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
>  
> > -

On Linux/Unix this can be shortened to:

> +

On Windows you should use type instead:

> >
> -cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
> +type ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
>  
> > > Only in cvs2svn-2.4.0-mod/www: .cvs2git.html.swp > > Nevertheless, it *would* be nice to add the Windows equivalent of the "cat" pipeline. I knew about the "type" command but I was under the impression that it is intended for text files and can corrupt binary files. Are you sure that using "type" as you suggest is binary-clean? Michael -- Michael Haggerty mhagger@alum.mit.edu http://softwareswirl.blogspot.com/