From: Finn Arne Gangstad <finnag@pvv.org>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org List" <git@vger.kernel.org>
Subject: Re: [PATCH v3 3/3] Don't expand CRLFs when normalizing text during merge
Date: Fri, 25 Jun 2010 10:00:43 +0200 [thread overview]
Message-ID: <20100625080043.GB4734@pvv.org> (raw)
In-Reply-To: <4C244278.10407@viscovery.net>
On Fri, Jun 25, 2010 at 07:45:28AM +0200, Johannes Sixt wrote:
> Am 6/24/2010 22:44, schrieb Eyvind Bernhardsen:
> > There's no need to expand CRLFs when convert_to_working_tree() is called
> > to normalize text for a merge since the text will be converted back
> > immediately. Improves performance of merges with conflicting line
> > endings when core.eol=crlf or core.autocrlf=true.
>
> Pardon me, first you make a big deal about normalization for merges, only
> that you finally omit it? What am I missing?
He calls convert_to_working_tree and then immediately calls
convert_to_git again. convert_to_git will still convert CRLF to LF
where appropriate, so the end result will be the same. There is no
reason to go through an "expensive" conversion of LF->CRLF in
convert_to_working_tree first.
- Finn Arne
prev parent reply other threads:[~2010-06-25 8:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-24 20:44 [PATCH v3 0/3] Help merging when text has been normalized Eyvind Bernhardsen
2010-06-24 20:44 ` [PATCH v3 1/3] Avoid conflicts when merging branches with mixed normalization Eyvind Bernhardsen
2010-06-24 20:44 ` [PATCH v3 2/3] Try normalizing files to avoid delete/modify conflicts when merging Eyvind Bernhardsen
2010-06-24 20:44 ` [PATCH v3 3/3] Don't expand CRLFs when normalizing text during merge Eyvind Bernhardsen
2010-06-25 5:45 ` Johannes Sixt
2010-06-25 7:58 ` Eyvind Bernhardsen
2010-06-25 8:17 ` Johannes Sixt
2010-06-25 8:58 ` Eyvind Bernhardsen
2010-06-25 8:00 ` Finn Arne Gangstad [this message]
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=20100625080043.GB4734@pvv.org \
--to=finnag@pvv.org \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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).