diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-04-08 21:30:51 +0200 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2014-06-13 18:27:33 +0100 |
| commit | e0db1dd7d4bc87825f0d7d743f1a01b4461a59ff (patch) | |
| tree | 49dcf04b8c40762603dfbabe954ea324317c7027 /lib/diff.tcl | |
| parent | 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce (diff) | |
| download | git-e0db1dd7d4bc87825f0d7d743f1a01b4461a59ff.tar.xz | |
git-gui: show staged submodules regardless of ignore config
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>
Diffstat (limited to 'lib/diff.tcl')
| -rw-r--r-- | lib/diff.tcl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 30d9a79776..b0a5180af7 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -287,6 +287,9 @@ proc start_show_diff {cont_info {add_opts {}}} { if {$w eq $ui_index} { lappend cmd diff-index lappend cmd --cached + if {[git-version >= "1.7.2"]} { + lappend cmd --ignore-submodules=dirty + } } elseif {$w eq $ui_workdir} { if {[string first {U} $m] >= 0} { lappend cmd diff |