git-gui: Use git diff --submodule when available

diff --git a/lib/diff.tcl b/lib/diff.tcl
index ae1ea3a615f8bc4c809341ae6c6dd3fcf8a54269..cd5b74c7280de3471dca9669c80cd2e105cb46bd 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -281,6 +281,15 @@ proc start_show_diff {cont_info {add_opts {}}} {
                }
        }
 
+       if {[string match {160000 *} [lindex $s 2]]
+        || [string match {160000 *} [lindex $s 3]]} {
+               set is_submodule_diff 1
+
+               if {[git-version >= "1.6.6"]} {
+                       lappend cmd --submodule
+               }
+       }
+
        lappend cmd -p
        lappend cmd --no-color
        if {$repo_config(gui.diffcontext) >= 1} {
@@ -296,9 +305,12 @@ 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 cmd {submodule summary -- $current_diff_path}
+       if {$is_submodule_diff && [git-version < "1.6.6"]} {
+               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]} {
@@ -343,9 +355,6 @@ proc read_diff {fd cont_info} {
                }
                set ::current_diff_inheader 0
 
-               if {[regexp {^\* } $line]} {
-                       set is_submodule_diff 1
-               }
                # -- Automatically detect if this is a 3 way diff.
                #
                if {[string match {@@@ *} $line]} {set is_3way_diff 1}
@@ -385,7 +394,9 @@ proc read_diff {fd cont_info} {
                        }
                } elseif {$is_submodule_diff} {
                        if {$line == ""} continue
-                       if {[regexp {^\* } $line]} {
+                       if {[regexp {^Submodule } $line]} {
+                               set tags d_@
+                       } elseif {[regexp {^\* } $line]} {
                                set line [string replace $line 0 1 {Submodule }]
                                set tags d_@
                        } else {
@@ -662,6 +673,7 @@ proc apply_line {x y} {
                }
                set i_l $next_l
        }
+       set patch "$patch$pre_context"
        set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
 
        if {[catch {