# [PATCH] git-gui: show staged submodules regardless of ignore config 2 messages from 2014-06-06 to 2014-06-13. Participants: Junio C Hamano, Pat Thoyts. Thread: https://gitlist.dev/t/36861 ## Junio C Hamano, 2014-06-06 21:10 Subject: [PATCH] git-gui: show staged submodules regardless of ignore config Message-ID: URL: https://gitlist.dev/e/xmqqppilpwwe.fsf%40gitster.dls.corp.google.com ``` From: Jens Lehmann Date: Tue, 8 Apr 2014 21:30:51 +0200 Currently setting submodule..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 Signed-off-by: Junio C Hamano --- * Pat, I've been carrying this in my 'pu' but I would prefer changes to git-gui fed to me through you. Could you apply this so that I can drop my tentative copy? git-gui.sh | 6 +++++- lib/diff.tcl | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/git-gui.sh b/git-gui.sh index cf2209b..c69bfb3 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 30d9a79..b0a5180 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 -- 2.0.0-531-gbd04298 ``` ## Pat Thoyts, 2014-06-13 17:36 Subject: Re: [PATCH] git-gui: show staged submodules regardless of ignore config Message-ID: <87k38k66j8.fsf@red.patthoyts.tk> URL: https://gitlist.dev/e/87k38k66j8.fsf%40red.patthoyts.tk In-Reply-To: ``` Junio C Hamano writes: >From: Jens Lehmann >Date: Tue, 8 Apr 2014 21:30:51 +0200 > >Currently setting submodule..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 >Signed-off-by: Junio C Hamano >--- > > * Pat, I've been carrying this in my 'pu' but I would prefer > changes to git-gui fed to me through you. Could you apply this > so that I can drop my tentative copy? > OK - Applied. -- Pat Thoyts http://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD ```