git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brad King <brad.king@kitware.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 0/2] submodule add + autocrlf + safecrlf
Date: Wed, 20 Jun 2012 10:43:31 -0400	[thread overview]
Message-ID: <cover.1340202515.git.brad.king@kitware.com> (raw)

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

             reply	other threads:[~2012-06-20 14:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-20 14:43 Brad King [this message]
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
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=cover.1340202515.git.brad.king@kitware.com \
    --to=brad.king@kitware.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).