On Sat, Nov 23, 2013 at 09:32:45PM +0100, Jens Lehmann wrote: > Am 22.11.2013 22:54, schrieb Heiko Voigt: > > What I think needs fixing here first is that the ignore setting should not > > apply to any diffs between HEAD and index. IMO, it should only apply > > to the diff between worktree and index. > > Not only that. It should also apply to diffs between commits/trees > and work tree but not between commits/trees. The reason the ignore > setting was added three years ago was to avoid expensive work tree > operations when it was clear that either the information wasn't > wanted or it took too much time to determine that. And I doubt you > want to see modifications to submodules in your work tree when > diffing against HEAD but not when diffing against the index. > > And this behavior happens to be just what the floating branch model > needs too. I'm not sure there isn't a use case out there that also > needs to silence diff & friends regarding submodule changes between > commits/trees and/or index too (even though I cannot come up with > one at the moment). So I propose to add "worktree" as another value > for the ignore option - which ignores submodule modifications in > the work tree - and leave "all" as it is. I am not so sure about that. Only finding out what has changed (commit wise) in a submodule is expensive. Just finding out whether a submodule sha1 has changed is not expensive. Maybe we should completely stop respecting the ignore=all setting for history and diff between index and HEAD. AFAIK, we do not have any other setting that instruct git to ignore specific parts of the history unless explicitly asked for by specifying a pathspec. And I think a user should never miss by accident that something has changed in the repository. Cheers Heiko -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html