Re: git commit vs. ignore-submodules

From: Ronald Weiss <weiss.ronald@gmail.com>
Date: Mar 29, 2014, 22:44 UTC
Message-ID: <CABxC_L-4=qcZiix05dL8GrDJXv=19fw4yB0qFzRRfw=G=_Gxbg@mail.gmail.com>
In-Reply-To: <5335A78C.60401@web.de>

On Fri, Mar 28, 2014 at 5:47 PM, Jens Lehmann <Jens.Lehmann@web.de> wrote:

> Such a patch would be very much appreciated. You might want to look
> into other commands that already have the --ignore-submodules option
> to get an idea how to do that. cmd_status() in builtin/commit.c
> should be a good starting point.

OK, I managed to create a patch, will post it as separate email right after this one. I also had to touch builtin/add.c, to make the new --ignore-submodes option work with "git commit -a" too.

Show 7 quoted lines

>> And also, I'd like to know git folks' opinion on whether it's OK that
>> git commit with ignore=all in .gitmodules ignores submodules even when
>> they are explicitely staged with git add.
>
> No, they should be visible in status and commit when the user chose
> to add them. I see if I can hack something up (as I've been bitten
> myself by that recently ;-).

While I was playing with that now, I discovered that the problem is actually not in commit, but only in status. Commit really commits the submodule, but it's not visible in the commit message (generated by status), that confused me before. And if there are no other changes in the index, then commit fails immediately with "no changes". A small change in wt-status.c fixes that for me, but I'm not sure about any undesired side effects. I'll post a patch for that too, in a few moments.