git gui: Use git diff --submodule when available
PATCH 1/1 git gui: Use git diff --submodule when available
The necessary feature is present since 1.6.6, it would be good to have this patch in the next release (see numbers below).
Shawn, This is a third re-send, in case you missed the previous rounds. Thanks.
-- >8 --
Subject: [PATCH] git gui: Use git diff --submodule when available
Doing so is much faster and gives the same output. Here are some numbers:
time git submodule summary
<snip>
real 0m0.219s
user 0m0.050s
sys 0m0.111s
time git diff --submodule
<snip>
real 0m0.012s
user 0m0.003s
sys 0m0.009s
--- git-gui/lib/diff.tcl | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)
git-gui/lib/diff.tcl +9 -12
@@ -281,6 +281,14 @@ proc start_show_diff {cont_info {add_opts {}}} { } } + if {[git-version >= "1.6.6"]} { + if {[string match {160000 *} [lindex $s 2]] + || [string match {160000 *} [lindex $s 3]]} { + set is_submodule_diff 1 + lappend cmd --submodule + } + } + lappend cmd -p lappend cmd --no-color if {$repo_config(gui.diffcontext) >= 1} {
@@ -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] - } - } - if {[catch {set fd [eval git_read --nice $cmd]} err]} { set diff_active 0 unlock_index
@@ -387,8 +385,7 @@ proc read_diff {fd cont_info} { } } elseif {$is_submodule_diff} { if {$line == ""} continue - if {[regexp {^\* } $line]} { - set line [string replace $line 0 1 {Submodule }] + if {[regexp {^Submodule } $line]} { set tags d_@ } else { set op [string range $line 0 2]
Signature · 1 line
1.6.6.1.558.gc20e6.dirty
Quoted 5 lines · Jens Lehmann
The necessary feature is present since 1.6.6, it would be good to have this patch in the next release (see numbers below).
Shawn, This is a third re-send, in case you missed the previous rounds. Thanks.
I didn't miss them, I just was ignoring git-gui patches for a while. I only work on git-gui in short spurts.
I actually just applied a modified version of your patch, so diff on submodules still works via submodule summary if git < 1.6.6.
Signature · 1 line
Shawn.
Am 23.01.2010 23:34, schrieb Shawn O. Pearce:
Quoted 2 lines
I actually just applied a modified version of your patch, so diff on submodules still works via submodule summary if git < 1.6.6.
One caveat: This will only work in versions 1.6.4 and above, as i had to add the --files option to git submodule summary to make it work.