Re: Re: Git issues with submodules

2013-11-29 Thread Heiko Voigt
On Mon, Nov 25, 2013 at 12:53:45PM -0800, Junio C Hamano wrote: > Heiko Voigt writes: > > > 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. > > Hmph. H

Re: Re: Re: Git issues with submodules

2013-11-25 Thread Heiko Voigt
On Mon, Nov 25, 2013 at 11:57:45PM +0600, Sergey Sharybin wrote: > Heiko, yeah sure see what you mean. Changing existing behavior is pretty PITA. > > Just one more question for now, are you referencing to the patch "[RFC > PATCH] disable complete ignorance of submodules for index <-> HEAD > diff"?

Re: Re: Git issues with submodules

2013-11-25 Thread Sergey Sharybin
Heiko, yeah sure see what you mean. Changing existing behavior is pretty PITA. Just one more question for now, are you referencing to the patch "[RFC PATCH] disable complete ignorance of submodules for index <-> HEAD diff"? Coz i tested it and seems it doesn't change behavior of add/commit. Also,

Re: Re: Git issues with submodules

2013-11-25 Thread Heiko Voigt
On Mon, Nov 25, 2013 at 03:02:51PM +0600, Sergey Sharybin wrote: > Am i right the intention is to make it so `git add .` and `git commit > .` doesn't include changes to submodule hash unless -f argument is > provided? Yes thats the goal. My patch currently only disables it when ignore is set to al

Re: Re: Git issues with submodules

2013-11-23 Thread Heiko Voigt
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 inde

Re: Re: Git issues with submodules

2013-11-23 Thread Heiko Voigt
Hi, On Sat, Nov 23, 2013 at 09:10:44PM +0100, Jens Lehmann wrote: > Am 22.11.2013 23:09, schrieb Jonathan Nieder: > > Heiko Voigt wrote: > > > >> After that we can discuss whether add should add submodules that are > >> tracked but not shown. How about commit -a ? Should it also ignore the > >> c

Re: Re: Git issues with submodules

2013-11-22 Thread Ramkumar Ramachandra
Heiko Voigt wrote: > 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. > > When we have that the user does not see the submodule changed when > normally working.

Re: Re: Git issues with submodules

2013-11-22 Thread Jonathan Nieder
Heiko Voigt wrote: > After that we can discuss whether add should add submodules that are > tracked but not shown. How about commit -a ? Should it also ignore the > change? I am undecided here. There does not seem to be any good > decision. From the users point of view we should probably not add i

Re: Re: Git issues with submodules

2013-11-22 Thread Heiko Voigt
Hi, On Fri, Nov 22, 2013 at 10:01:44PM +0100, Jens Lehmann wrote: > Hmm, looks like git show also needs to be fixed to honor the > ignore setting from .gitmodules. It already does that for > diff.ignoreSubmodules from either .git/config or git -c and > also supports the --ignore-submodules command