Hi,
On Mon, 16 Feb 2009, Ferry Huberts (Pelagic) wrote:
> Johannes Schindelin wrote:
>
> > 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.
Well, the tests and the man page changes I asked you to do don't require
Perl..
> Isn't it a better idea to have the original authors do this? They
> understand the code.
No. This is Open Source, and it is not their itch.
> 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 :-)
That's the best way to start.
> 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.
No problem, I am here (if you want to cope with me, that is).
Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
