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

Re: [PATCH 2/2] submodule: Tolerate auto/safecrlf when adding .gitmodules

From
Jens Lehmann <jens.lehmann@web.de>
Date
Jun 20, 2012, 18:21 UTC
Message-ID
<4FE21493.8000206@web.de>
In-Reply-To
<4FE21133.2030001@kitware.com>
Am 20.06.2012 20:06, schrieb Brad King:
Show 23 quoted lines
> 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.
Yep.
Previous: Brad KingNext: Jeff King
Message 6 of 12 in “submodule add + autocrlf + safecrlf”
  1. 0/2 submodule add + autocrlf + safecrlfBrad King, Jun 20, 2012
  2. 1/2 submodule: Demonstrate failure to add with auto/safecrlfBrad King, Jun 20, 2012
  3. 2/2 submodule: Tolerate auto/safecrlf when adding .gitmodulesBrad King, Jun 20, 2012
  4. Jens LehmannJun 20, 2012
  5. Brad KingJun 20, 2012
  6. Jens LehmannJun 20, 2012
  7. Jeff KingJun 20, 2012
  8. Junio C HamanoJun 20, 2012
  9. Jens LehmannJun 21, 2012
  10. Junio C HamanoJun 20, 2012
  11. Brad KingJun 20, 2012
  12. Junio C HamanoJun 20, 2012

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.