Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] git-gui: show staged submodules regardless of ignore config

From: Pat Thoyts <hidden>
Date: 2016-06-15 23:01:37

Junio C Hamano [off-list ref] writes:
From: Jens Lehmann <redacted>
Date: Tue, 8 Apr 2014 21:30:51 +0200

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

* 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help