[PATCH 0/2] submodule add + autocrlf + safecrlf

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Folks,

When 'git submodule add' uses 'git config' to create a
'.gitmodules' file it gets LF newlines that the subsequent
'git add --force .gitmodules' rejects if autocrlf and
safecrlf are both enabled.  This series adds a test and
proposes a fix that simply uses '-c core.safecrlf=false'
to disable safecrlf when adding '.gitmodules'.

I'm not excited by allowing a LF file in work tree that
has clearly been configured to prefer CRLF, but avoiding
that for .gitmodules is probably a separate issue.

-Brad

Brad King (2):
  submodule: Demonstrate failure to add with auto/safecrlf
  submodule: Tolerate auto/safecrlf when adding .gitmodules

 git-submodule.sh           |    2 +-
 t/t7400-submodule-basic.sh |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

-- 
1.7.10

--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]