From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Sebastian Schuberth <sschuberth@gmail.com>
Subject: Re: [PATCH] Respect core.autocrlf when preparing temporary files for external diff
Date: Sat, 21 Mar 2009 17:03:21 -0700 [thread overview]
Message-ID: <7v8wmybf06.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0903220053260.10279@pacific.mpi-cbg.de> (Johannes Schindelin's message of "Sun, 22 Mar 2009 00:54:43 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Sat, 21 Mar 2009, Junio C Hamano wrote:
>
>> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>>
>> > When preparing temporary files for an external diff, the files should
>> > be handled as if they were worktree files.
>>
>> I do not think so. convert_to_working_tree() aka "smudge" means you
>> would be feeding crap like $Id$ expansion to the external diff, which we
>> chose not to do quite on purpose.
>
> You might have missed me mentioning that we often can do without temporary
> files, taking the working directory copies right away?
>
> And if you think about it, it makes complete sense.
Not "complete".
What is at issue is how consistent the codepath that calls out to an
external diff should be with the rest of git that solely work with the
"clean" version of blob contents. If you value consistency, I would say
that it is valid to argue that letting it borrow from a work tree is a
bug. It should be always feeding a clean version.
But if you think that we do not care really about the correctness of the
external diff codepath, because it is a mechanism used mostly for giving
output to humans (as opposed to feeding the output of the external diff
program back to programs to be processed further) , I can understand why
you think it is easier to the external programs if "smudged" version is
fed to them.
Not just I can _understand_, but I think I could be pursuaded to agree
with that position, iff you try harder.
But the assumption/rationale behind this change needs to be spelled out.
In essence, we are sacrificing purity and correctness because we consider
ease of building external diff filter is more important.
Or something like that.
next prev parent reply other threads:[~2009-03-22 0:05 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 [this message]
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
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=7v8wmybf06.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--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).