From: Brad King <brad.king@kitware.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 2/2] submodule: Tolerate auto/safecrlf when adding .gitmodules
Date: Wed, 20 Jun 2012 14:06:43 -0400 [thread overview]
Message-ID: <4FE21133.2030001@kitware.com> (raw)
In-Reply-To: <4FE20DD3.6040607@web.de>
On 06/20/2012 01:52 PM, Jens Lehmann wrote:
> Am 20.06.2012 16:43, schrieb Brad King:
>> Temporarily disable 'core.safecrlf' to add '.gitmodules' so that
>> 'git add' does not reject the LF newlines we write to the file
>> even if both 'core.autocrlf' and 'core.safecrlf' are enabled.
>> This fixes known breakage tested in t7400-submodule-basic.
>
> Hmm, I have no objections against the intention of the patch. But
> as I understand it this message will reoccur when the user e.g.
> edits the .gitmodules file later with any editor who just writes
> lfs and adds it.
>
> I don't know terribly much about crlf support but maybe flagging
> the .gitmodules file in .gitattributes would be a better solution
> here? Opinions?
Once a user edits the file with an outside tool it is his/her
responsibility to add .gitattributes for the file. In the reported
case Git is creating the file and already knows the crlf mode when
creating it.
I think Junio's proposal to teach "git config" to respect crlf
configuration is a more general solution.
-Brad
next prev parent reply other threads:[~2012-06-20 18:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 14:43 [PATCH 0/2] submodule add + autocrlf + safecrlf Brad King
2012-06-20 14:43 ` [PATCH 1/2] submodule: Demonstrate failure to add with auto/safecrlf Brad King
2012-06-20 14:43 ` [PATCH 2/2] submodule: Tolerate auto/safecrlf when adding .gitmodules Brad King
2012-06-20 17:52 ` Jens Lehmann
2012-06-20 18:06 ` Brad King [this message]
2012-06-20 18:21 ` Jens Lehmann
2012-06-20 19:11 ` Jeff King
2012-06-20 19:53 ` Junio C Hamano
2012-06-21 19:06 ` Jens Lehmann
2012-06-20 17:49 ` [PATCH 0/2] submodule add + autocrlf + safecrlf Junio C Hamano
2012-06-20 18:09 ` Brad King
2012-06-20 19:24 ` Junio C Hamano
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=4FE21133.2030001@kitware.com \
--to=brad.king@kitware.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.