git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@samba.org>
To: Thomas Rast <trast@student.ethz.ch>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Eelis van der Weegen <eelis@eelis.net>,
	Junio C Hamano <gitster@pobox.com>, Miles Bader <miles@gnu.org>,
	Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH v4 3/3] gitk: add the equivalent of diff --color-words
Date: Sat, 17 Apr 2010 16:35:57 +1000	[thread overview]
Message-ID: <20100417063557.GB6681@brick.ozlabs.ibm.com> (raw)
In-Reply-To: <bc720738f918f0523842b3839b7e611c453b5241.1271260308.git.trast@student.ethz.ch>

On Wed, Apr 14, 2010 at 05:59:08PM +0200, Thomas Rast wrote:

> Use the newly added 'diff --word-diff=porcelain' to teach gitk a
> color-words mode, with two different modes analogous to the
> --word-diff=plain and --word-diff=color settings.  These are selected
> by a dropdown box.
> 
> As an extra twist, automatically enable this word-diff support when
> the user mentions a word-diff related option on the command line.
> These options were previously ignored because they would break diff
> parsing.
> 
> Both of these features are only enabled if we have a version of git
> that supports --word-diff=porcelain, tentatively set to 1.7.2.
> 
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>

Looks fine.  The only nit I can see is that a "--word-diffoobar"
option would get treated as "--word-diff=plain" rather than giving an
error or being passed as-is to git log.

When does this need to go in, i.e. when is the git patch likely to go
in?

Paul.

  reply	other threads:[~2010-04-17  6:36 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1269996525.git.trast@student.ethz>
2010-04-04 13:46 ` [PATCH 0/2] gitk --color-words Thomas Rast
2010-04-04 13:46   ` [PATCH 1/2] diff: add --word-diff option that generalizes --color-words Thomas Rast
2010-04-05  2:06     ` Junio C Hamano
2010-04-05 10:20       ` Thomas Rast
2010-04-05 18:46         ` Junio C Hamano
2010-04-05 18:53           ` Miles Bader
2010-04-12 13:07             ` [PATCH v3 0/2] gitk --color-words Thomas Rast
2010-04-12 13:07               ` [PATCH v3 1/3] diff: add --word-diff option that generalizes --color-words Thomas Rast
2010-04-12 16:31                 ` Junio C Hamano
2010-04-13  9:27                   ` Thomas Rast
2010-04-14 15:59                   ` [PATCH v4 0/3] git-diff --word-diff/gitk --color-words Thomas Rast
2010-04-14 15:59                     ` [PATCH v4 1/3] diff: add --word-diff option that generalizes --color-words Thomas Rast
2010-04-14 21:23                       ` Junio C Hamano
2010-04-14 15:59                     ` [PATCH v4 2/3] gitk: do not parse " >" context as submodule change Thomas Rast
2010-04-15 19:57                       ` Jens Lehmann
2010-04-17  6:33                       ` Paul Mackerras
2010-04-17 12:20                         ` Thomas Rast
2010-04-19  1:08                           ` Paul Mackerras
2010-04-19 16:27                             ` [PATCH v4' 1/2] " Thomas Rast
2010-04-19 16:27                               ` [PATCH v4' 2/2] gitk: add the equivalent of diff --color-words Thomas Rast
2010-04-19 17:22                               ` [PATCH v4' 1/2] gitk: do not parse " >" context as submodule change Jens Lehmann
2010-04-20 17:05                                 ` Jens Lehmann
2010-04-14 15:59                     ` [PATCH v4 3/3] gitk: add the equivalent of diff --color-words Thomas Rast
2010-04-17  6:35                       ` Paul Mackerras [this message]
2010-04-17  6:55                         ` Junio C Hamano
2010-04-12 13:07               ` [PATCH v3 2/3] gitk: do not parse " >" context as submodule change Thomas Rast
2010-04-12 13:25                 ` [PATCH v3.1] " Thomas Rast
2010-04-12 13:07               ` [PATCH v3 3/3] gitk: add the equivalent of diff --color-words Thomas Rast
2010-04-06  9:20           ` [PATCH 1/2] diff: add --word-diff option that generalizes --color-words Thomas Rast
2010-04-04 13:46   ` [PATCH 2/2] gitk: add the equivalent of diff --color-words Thomas Rast

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=20100417063557.GB6681@brick.ozlabs.ibm.com \
    --to=paulus@samba.org \
    --cc=Jens.Lehmann@web.de \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=eelis@eelis.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=miles@gnu.org \
    --cc=trast@student.ethz.ch \
    /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).