From: Steffen Prohaska <prohaska@zib.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <junio@pobox.com>,
prohaska@zib.de, tormod.hystad@gmail.com,
msysGit <msysgit@googlegroups.com>,
git@vger.kernel.org
Subject: Store autocrlf during init-db (was [msysGit] autocrlf problems with Git-preview20080301.exe)
Date: Sun, 23 Mar 2008 10:31:36 +0100 (CET) [thread overview]
Message-ID: <alpine.OSX.1.00.0803230943500.7541@cougar> (raw)
In-Reply-To: <alpine.LSU.1.00.0803230310500.4353@racer.site>
On Sun, 23 Mar 2008, Johannes Schindelin wrote:
> On Sat, 22 Mar 2008, Junio C Hamano wrote:
>
> >
> > Steffen Prohaska <prohaska@zib.de> writes:
> >
> > >> I suppose autocrlf enabled by default could be useful for new
> > >> repositories, but not for working with existing repositories.
> > >
> > > We changed the global default to a sane setting for cross-platform
> > > projects to avoid such problems in the future. This means that from
> > > now on git will take care that any repository newly created will have
> > > sane line endings (LF in the repository; and CRLF in the work tree if
> > > checked out on Windows respectively LF if checked out on Unix).
> >
> > I've always wondered why you guys used /etc/gitconfig instead of setting
> > it in the templates (or a patch to git-init).
> >
> > I was against the idea of /etc/gitconfig from the very beginning (even
> > before msysgit existed) in git.git itself, but this is a very good
> > example why /etc/gitconfig is a bad idea. It affects _existing_ setups.
> >
> > How about fixing msys port so that it sets the configuration when the
> > user initializes a _new_ repository, without breaking repositories the
> > user has been happily using?
>
> Makes sense.
Hmm. I am not convinced.
Setting autocrlf for every repository limits the user's options to
override the default. Currently we provide a global default and the
user can either override globally for all his repositories or on
a per-repository basis. Hence, users can decide that they want autocrlf
to never happen and can easily set this in ~/.gitconfig. If we stored
autocrlf in every newly created repository, the user would need to
override our default again and again for every new repository.
Maybe what we want is to conserve the setup that exists when a new
repository is created. Changing autocrlf later is tricky because the
work tree's line endings depend on the settings during checkout.
Therefore, it makes sense to preserve the value of autocrlf that exists
during the first checkout. In this regards autocrlf is different from,
for example, author because author can be easily changed later without
requiring any conversion of existing files in the work tree.
Patch follows.
Unfortunately the proposed change won't change the fact that existing
msysgit setups still break. I still do not see an easy way to avoid
this.
Steffen
next parent reply other threads:[~2008-03-23 9:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <f5d99ae7-e4b3-4632-ad86-8ebe0e683d49@d62g2000hsf.googlegroups.com>
[not found] ` <alpine.LSU.1.00.0803101327390.3975@racer.site>
[not found] ` <bdca99240803100611s3c8b3b9djb1b993c9fbad712@mail.gmail.com>
[not found] ` <alpine.LSU.1.00.0803101448430.3975@racer.site>
[not found] ` <cb8f4255-2bf8-4489-aeb0-c18d6e932342@s13g2000prd.googlegroups.com>
[not found] ` <ab311292-809f-4e45-a19d-a600c2333ab6@a23g2000hsc.googlegroups.com>
[not found] ` <alpine.OSX.1.00.0803221036230.7618@cougar>
[not found] ` <7vzlsqfe2h.fsf@gitster.siamese.dyndns.org>
[not found] ` <alpine.LSU.1.00.0803230310500.4353@racer.site>
2008-03-23 9:31 ` Steffen Prohaska [this message]
2008-03-23 9:34 ` [PATCH] init-db: Store current value of autocrlf Steffen Prohaska
2008-03-24 0:16 ` Dmitry Potapov
2008-03-23 11:01 ` Store autocrlf during init-db (was [msysGit] autocrlf problems with Git-preview20080301.exe) Johannes Schindelin
2008-03-23 12:30 ` Steffen Prohaska
2008-03-23 13:05 ` [msysGit] " Johannes Schindelin
2008-03-23 13:42 ` Steffen Prohaska
2008-03-23 14:07 ` [msysGit] " Johannes Schindelin
2008-03-23 15:50 ` Steffen Prohaska
2008-03-23 16:35 ` Johannes Schindelin
2008-03-23 22:53 ` Steffen Prohaska
2008-03-23 23:39 ` [msysGit] " Johannes Schindelin
2008-03-23 23:56 ` Dmitry Potapov
2008-03-24 0:01 ` [msysGit] " Johannes Schindelin
2008-03-24 0:23 ` Dmitry Potapov
2008-03-24 10:57 ` Johannes Schindelin
2008-03-24 12:21 ` Dmitry Potapov
2008-03-24 15:12 ` [PATCH] Introduce core.initHook Johannes Schindelin
2008-03-24 15:14 ` [PATCH] init: show "Reinit" message even in an (existing) empty repository Johannes Schindelin
2008-03-25 7:35 ` Junio C Hamano
2008-03-25 9:55 ` Johannes Schindelin
2008-03-24 20:25 ` [PATCH] Introduce core.initHook Junio C Hamano
2008-03-24 21:40 ` [PATCH v2] " Johannes Schindelin
2008-03-24 22:40 ` Junio C Hamano
2008-03-24 23:21 ` [PATCH v3] " Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.OSX.1.00.0803230943500.7541@cougar \
--to=prohaska@zib.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junio@pobox.com \
--cc=msysgit@googlegroups.com \
--cc=tormod.hystad@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox