From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org, Sebastian Schuberth <sschuberth@gmail.com>
Subject: Re: [PATCH] Respect core.autocrlf when preparing temporary files for external diff
Date: Sun, 22 Mar 2009 17:39:47 -0700 [thread overview]
Message-ID: <7vljqx9ing.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 20090322074643.GA4826@coredump.intra.peff.net
Jeff King <peff@peff.net> writes:
> On Sun, Mar 22, 2009 at 12:18:33AM -0700, Junio C Hamano wrote:
>
>> Ok. Although I already queued the removal to 'pu' for tonight's pushout
>> and it is way too late to revert that, I think I didn't have to remove the
>> function. The codepath that lets you cheat by borrowing from the checkout
>> runs convert_to_git() when it borrows, and if you are seeing a meaningful
>> optimization even with that overhead, perhaps it would be worth keeping.
>
> I certainly haven't done exhaustive tests. Obviously the one I did was a
> bit contrived. I just think it makes sense to have numbers rather than
> saying "this probably doesn't do anything anymore".
>
>> While the purist in me says #1 above is the right argument to make for
>> feeding "clean" version, I suspect that the textconv or extdiff tools more
>> often are not made from scratch and ported across platforms than are
>> cobbled up together out of tools the script writer finds on his platform.
>> I suspect that Dscho's "a tempfile should look like a checkout" would be
>> much friendlier to them in practice for this reason.
>
> I think you and I have about the same feeling on this, then. As somebody
> who does not actually use smudge/clean filters at all, I am willing to
> defer to Dscho's opinion, which is based on practical experience.
Thanks for a sanity check.
I've split these as two unrelated issues, and have queued
(1) Dscho's patch, that always feeds smudged representation to the
external diff and textconv filter;
(2) A change to reuse_worktree_file() that says "don't reuse" for paths
with CE_VALID set.
in 'pu'.
prev parent reply other threads:[~2009-03-23 0:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1237635609u.git.johannes.schindelin@gmx.de>
2009-03-21 11:42 ` [PATCH] Respect core.autocrlf when preparing temporary files for external diff Johannes Schindelin
2009-03-21 17:02 ` Michael J Gruber
2009-03-21 19:35 ` Junio C Hamano
2009-03-21 23:54 ` Johannes Schindelin
2009-03-22 0:03 ` Junio C Hamano
2009-03-22 0:41 ` Junio C Hamano
2009-03-22 6:10 ` Jeff King
2009-03-22 7:18 ` Junio C Hamano
2009-03-22 7:46 ` Jeff King
2009-03-22 15:30 ` Sebastian Schuberth
2009-03-22 21:59 ` Junio C Hamano
2009-03-22 22:48 ` Sebastian Schuberth
2009-03-22 23:12 ` Junio C Hamano
2009-03-23 0:39 ` Junio C Hamano [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=7vljqx9ing.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sschuberth@gmail.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).