diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-04-08 21:30:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-15 15:27:49 -0700 |
| commit | 966ab9581a99c26b7be38e37e18c3f6158833059 (patch) | |
| tree | 49dcf04b8c40762603dfbabe954ea324317c7027 | |
| parent | 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce (diff) | |
| download | git-jl/git-gui-show-added-submodule-changes.tar.gz | |
git-gui: show staged submodules regardless of ignore configjl/git-gui-show-added-submodule-changes
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>
| -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 |