From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git full diff output issues..
Date: Thu, 26 May 2005 12:46:22 -0700 [thread overview]
Message-ID: <7vpsvdbwj5.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0505261223240.2307@ppc970.osdl.org> (Linus Torvalds's message of "Thu, 26 May 2005 12:25:15 -0700 (PDT)")
I'd appreciate it if you take these two patches I sent last
night.
* Add git-external-diff-script
This is a demonstration of GIT_EXTERNAL_DIFF mechanism, and a
testbed for tweaking and enhancing what the built-in diff should
be. This script is designed to output exactly the same output
as the built-in diff driver produces when set as GIT_EXTERNAL_DIFF.
* Diff updates.
With the introduction of 'T', and the "apply-patch" Linus has
been quietly working on without much advertisement, it started
to make sense to emit usable information in the "diff --git"
patch output format. Earlier built-in diff driver punted and
did not say anything about a symbolic link changing into a file
or vice versa, but this version represents that as a pair of
deletion and creation.
After that, you can experiment to flush out issues with the
current built-in using git-external-diff-script for quick
turnaround. When you have a concrete "ok this is good" format
we can port that to C in diff.c:builtin_diff().
next prev parent reply other threads:[~2005-05-26 19:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-26 19:19 git full diff output issues Linus Torvalds
2005-05-26 19:25 ` Linus Torvalds
2005-05-26 19:36 ` Junio C Hamano
2005-05-26 19:46 ` Junio C Hamano [this message]
2005-05-26 19:53 ` Anton Altaparmakov
2005-05-26 20:33 ` Linus Torvalds
2005-05-26 20:56 ` Junio C Hamano
2005-05-26 21:09 ` Linus Torvalds
2005-05-26 21:33 ` Junio C Hamano
2005-06-05 8:46 ` Junio C Hamano
2005-06-05 15:11 ` Linus Torvalds
2005-05-26 23:34 ` Chris Wedgwood
2005-05-26 23:49 ` Linus Torvalds
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=7vpsvdbwj5.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.