public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: "Neal Kreitzinger" <neal@rsss•com>
To: git@vger•kernel.org
Subject: convert crlf to eol on vendor branch overlay
Date: Thu, 7 Apr 2011 21:40:29 -0500	[thread overview]
Message-ID: <inlsit$scv$1@dough.gmane.org> (raw)

My vendor gave me a tarball with all CRLF eol's.  I'm using the 
vendor-branch overlay method (git ls-files -z | xargs -0 rm -f && tar -xvzf 
tarfile.tar.gz).  How do I convert the eol's to LF?

I tried this:

vi .git/attributes
SRC/*/* text  (convert these to LF eol on commit)

$ git config core.eol lf (convert "text" attr files to LF eol on checkout)

$ git add . -A
$ git commit -m'convert eol'  (should convert CRLF to LF)
$ git checkout otherbranch  (change worktree)
$ git checkout vendorbranch (checkout worktree from commit to get LF 
version)
$ git reset HEAD^  (remove commit but keep worktree LF version)
$ git diff (still CRLF)
$ git status (still show everything as modified due to CRLF)

v/r,
neal 

next             reply	other threads:[~2011-04-08  2:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-08  2:40 Neal Kreitzinger [this message]
2011-04-08  4:43 ` convert crlf to eol on vendor branch overlay Junio C Hamano
2011-04-08 18:18   ` Neal Kreitzinger

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='inlsit$scv$1@dough.gmane.org' \
    --to=neal@rsss$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox