undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: fix diff for partially staged submodule changes

Browse Source 
When a submodule commit had already been staged and another commit had
been checked out inside the submodule, the diff always displayed the
submodule commit log messages between the last supermodule commit and
the working tree, totally ignoring the commit in the index.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Jens Lehmann 2009-08-26 22:25:15 +02:00 committed by Shawn O. Pearce
parent b350e460da
commit af413de47b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/diff.tcl
View File

@ -298,7 +298,12 @@ proc start_show_diff {cont_info {add_opts {}}} {
if {[string match {160000 *} [lindex $s 2]]
|| [string match {160000 *} [lindex $s 3]]} {
set cmd {submodule summary -- $current_diff_path}
set is_submodule_diff 1
if {$w eq $ui_index} {
set cmd {submodule summary --cached -- $current_diff_path}
} else {
set cmd {submodule summary --files -- $current_diff_path}
}
}
if {[catch {set fd [eval git_read --nice $cmd]} err]} {
@ -343,9 +348,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}