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

git-gui: show staged submodules regardless of ignore config

Browse Source 
Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to
"all" suppresses all output of submodule changes for git-gui. This is
really confusing, as even when the user chooses to record a new commit for
an ignored submodule by adding it manually this change won't show up under
"Staged Changes (Will Commit)".

Fix that by using the '--ignore-submodules=dirty' option for both callers
of "git diff-index --cached" when the underlying git version supports that
option.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Jens Lehmann 2014-04-08 21:30:51 +02:00 committed by Pat Thoyts
parent 1b2c79e63e
commit e0db1dd7d4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-gui.sh
View File

@ -1558,7 +1558,11 @@ proc rescan_stage2 {fd after} {
set rescan_active 2 set rescan_active 2
ui_status [mc "Scanning for modified files ..."] ui_status [mc "Scanning for modified files ..."]
if {[git-version >= "1.7.2"]} {
set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
} else {
set fd_di [git_read diff-index --cached -z [PARENT]] set fd_di [git_read diff-index --cached -z [PARENT]]
}
set fd_df [git_read diff-files -z] set fd_df [git_read diff-files -z]
fconfigure $fd_di -blocking 0 -translation binary -encoding binary fconfigure $fd_di -blocking 0 -translation binary -encoding binary

3
lib/diff.tcl
View File

@ -287,6 +287,9 @@ proc start_show_diff {cont_info {add_opts {}}} {
if {$w eq $ui_index} { if {$w eq $ui_index} {
lappend cmd diff-index lappend cmd diff-index
lappend cmd --cached lappend cmd --cached
if {[git-version >= "1.7.2"]} {
lappend cmd --ignore-submodules=dirty
}
} elseif {$w eq $ui_workdir} { } elseif {$w eq $ui_workdir} {
if {[string first {U} $m] >= 0} { if {[string first {U} $m] >= 0} {
lappend cmd diff lappend cmd diff