Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
	Git Mailing List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] git gui: Use git diff --submodule when available
Date: Thu, 10 Dec 2009 14:52:54 -0800	[thread overview]
Message-ID: <7vskbi8mrd.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4B2179E4.3070603@web.de> (Jens Lehmann's message of "Thu\, 10 Dec 2009 23\:44\:52 +0100")

Jens Lehmann <Jens.Lehmann@web.de> writes:

> Changed the use of submodule summary to diff --submodule because the
> implementation in C is much faster than the submodule script. Also a test
> has been added to make sure that the underlying git supports the diff
> option --submodule (which was introduced in 1.6.6).
>
> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
> ---
> @@ -296,16 +304,6 @@ proc start_show_diff {cont_info {add_opts {}}} {
>  		lappend cmd $path
>  	}
>
> -	if {[string match {160000 *} [lindex $s 2]]
> -        || [string match {160000 *} [lindex $s 3]]} {
> -		set is_submodule_diff 1
> -		if {$w eq $ui_index} {
> -			set cmd [list submodule summary --cached -- $path]
> -		} else {
> -			set cmd [list submodule summary --files -- $path]
> -		}
> -	}
> -

Heh, I didn't even know that it originally came from git-gui ;-)

      reply	other threads:[~2009-12-10 22:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-10 22:44 [PATCH] git gui: Use git diff --submodule when available Jens Lehmann
2009-12-10 22:52 ` 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=7vskbi8mrd.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox