From: Junio C Hamano <gitster@pobox•com>
To: Jens Lehmann <Jens.Lehmann@web•de>
Cc: Ronald Weiss <weiss.ronald@gmail•com>,
git@vger•kernel.org, Heiko Voigt <hvoigt@hvoigt•net>
Subject: Re: git commit vs. ignore-submodules
Date: Fri, 28 Mar 2014 10:59:19 -0700 [thread overview]
Message-ID: <xmqqbnwqb3wo.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <5335A78C.60401@web.de> (Jens Lehmann's message of "Fri, 28 Mar 2014 17:47:08 +0100")
Jens Lehmann <Jens.Lehmann@web•de> writes:
>> .. but it's less clear if one explicitely stages an updated
>> submodule using git add. Git commit will ignore it anyway, if
>> ignore=all is configured in .gitmodules. Maybe that's correct too
That definitely smells like a bug to me. Excluding modified
submodules when "git add -u" is run with ignore=all would be fine
and most likely the right thing to do, but once the user actually
adds the change to the index, it should not be ignored.
> ...
>> 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 ;-).
Thanks.
next prev parent reply other threads:[~2014-03-28 17:59 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-27 23:36 git commit vs. ignore-submodules Ronald Weiss
2014-03-28 16:47 ` Jens Lehmann
2014-03-28 17:59 ` Junio C Hamano [this message]
2014-03-29 22:44 ` Ronald Weiss
2014-03-29 22:50 ` [PATCH 1/2] commit: add --ignore-submodules[=<when>] parameter Ronald Weiss
2014-03-29 23:14 ` Jens Lehmann
2014-03-30 19:48 ` Jens Lehmann
2014-03-30 23:43 ` [PATCH v2] " Ronald Weiss
2014-03-31 0:07 ` [PATCH v2.1] " Ronald Weiss
2014-03-31 18:58 ` Jens Lehmann
2014-03-31 20:37 ` Jens Lehmann
2014-03-31 21:50 ` Ronald Weiss
2014-03-31 21:47 ` Ronald Weiss
2014-03-31 22:50 ` Ronald Weiss
2014-03-31 23:35 ` Ronald Weiss
2014-04-01 20:23 ` Jens Lehmann
2014-04-01 21:59 ` Ronald Weiss
2014-04-02 18:53 ` Jens Lehmann
2014-04-02 19:56 ` Ronald Weiss
2014-04-06 16:28 ` Jens Lehmann
2014-04-07 21:46 ` Ronald Weiss
2014-04-07 23:01 ` [PATCH v3 1/2] add: " Ronald Weiss
2014-04-07 23:03 ` [PATCH v3 2/2] commit: " Ronald Weiss
2014-04-08 18:43 ` Jens Lehmann
2014-04-08 20:19 ` Ronald Weiss
2014-04-12 22:20 ` Ronald Weiss
2014-04-12 22:45 ` [PATCH v4 1/2] add: " Ronald Weiss
2014-04-18 11:53 ` Jens Lehmann
2014-04-21 21:19 ` Ronald Weiss
2014-04-12 22:49 ` [PATCH v4 2/2] commit: " Ronald Weiss
2014-04-18 12:09 ` Jens Lehmann
2014-04-21 22:08 ` Ronald Weiss
2014-04-22 19:14 ` Jens Lehmann
2014-04-22 21:12 ` [PATCH v5 1/2] add: " Ronald Weiss
2014-04-23 20:25 ` Eric Sunshine
2014-04-24 19:34 ` [PATCH v6 " Ronald Weiss
2014-04-24 19:42 ` [PATCH v6 2/2] commit: " Ronald Weiss
2014-04-22 21:13 ` [PATCH v5 " Ronald Weiss
2014-04-14 18:30 ` [PATCH v3 " Junio C Hamano
2014-04-14 20:18 ` Ronald Weiss
2014-04-14 21:08 ` Junio C Hamano
2014-04-08 18:26 ` [PATCH v2.1] " Jens Lehmann
2014-04-12 23:41 ` Ronald Weiss
2014-04-18 12:28 ` Jens Lehmann
2014-04-22 22:21 ` Ronald Weiss
2014-03-31 17:14 ` [PATCH 1/2] " Junio C Hamano
2014-03-29 22:56 ` [PATCH 2/2] status: don't ignore submodules added to index Ronald Weiss
2014-03-29 23:16 ` Jens Lehmann
2014-03-29 23:40 ` Ronald Weiss
2014-03-30 0:01 ` Ronald Weiss
2014-03-30 10:14 ` [WIP/PATCH] status/commit: always show staged submodules regardless of ignore config Jens Lehmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbnwqb3wo.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
--cc=weiss.ronald@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox