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 | |
| parent | git-gui 0.19 (diff) | |
| download | tgif-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>
| -rwxr-xr-x | git-gui.sh | 6 | ||||
| -rw-r--r-- | lib/diff.tcl | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index cf2209b4f2..c69bfb310e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1558,7 +1558,11 @@ proc rescan_stage2 {fd after} { set rescan_active 2 ui_status [mc "Scanning for modified files ..."] - set fd_di [git_read diff-index --cached -z [PARENT]] + 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_df [git_read diff-files -z] fconfigure $fd_di -blocking 0 -translation binary -encoding binary 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 |