From: Junio C Hamano <gitster@pobox•com>
To: Brandon Williams <bmwill@google•com>
Cc: Stefan Beller <sbeller@google•com>,
Lars Schneider <larsxschneider@gmail•com>,
Heiko Voigt <hvoigt@hvoigt•net>,
"git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: [PATCH] pull: respect submodule update configuration
Date: Mon, 21 Aug 2017 15:52:09 -0700 [thread overview]
Message-ID: <xmqqa82s5yau.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170821182110.GA156514@google.com> (Brandon Williams's message of "Mon, 21 Aug 2017 11:21:10 -0700")
Brandon Williams <bmwill@google•com> writes:
>> > I tried to make it work here:
>> > https://public-inbox.org/git/89AB8AA3-8E19-46BA-B169-D1EA4CF4ABE7@gmail.com/
>>
>> (A) you need to set expect there as well, to have sub{2,4,5} be expected
>> there as well.
>>
>> (B) That may hint at another (UX) bug.
>>
>> The test case there uses "git submodule update --init".
>> The init flag will set all submodules to active.
>>
>> Maybe you want
>>
>> git config submodule.active ":(exclude)sub0"
>> git config --add submodule.active ":(exclude)sub2"
>> git config --add submodule.active "."
>> # Read: anything except sub0 and sub2 are interesting
>>
>> git submodule update
>> # no init flag, needed even for new submodules IIUC
Sounds like a good solution. I do think what Stefan said about
"reset --hard --recurse-submodules" makes tons of sense, and we
should do a hard reset in submodules as long as they are marked
as active, regardless of what the .update option says. I have
not thought deeply enough about other operations like "pull" in
his message to be able to comment, though.
Thanks.
next prev parent reply other threads:[~2017-08-21 22:52 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-16 18:35 Submodule regression in 2.14? Lars Schneider
2017-08-16 18:51 ` Stefan Beller
2017-08-16 18:53 ` Stefan Beller
2017-08-17 21:21 ` Lars Schneider
2017-08-17 21:55 ` Stefan Beller
2017-08-18 2:13 ` Junio C Hamano
2017-08-18 4:02 ` Stefan Beller
2017-08-18 16:50 ` Junio C Hamano
2017-08-18 19:09 ` Stefan Beller
2017-08-19 6:51 ` Junio C Hamano
2017-08-21 16:05 ` Heiko Voigt
2017-08-21 16:42 ` Stefan Beller
2017-08-22 15:33 ` Heiko Voigt
2017-08-22 18:10 ` Stefan Beller
2017-08-25 9:10 ` Heiko Voigt
2017-08-25 16:38 ` Stefan Beller
2017-08-25 16:53 ` Junio C Hamano
2017-08-21 16:48 ` Junio C Hamano
2017-08-22 15:50 ` Heiko Voigt
2017-08-21 16:46 ` Stefan Beller
2017-08-21 22:45 ` Junio C Hamano
2017-08-18 13:12 ` Lars Schneider
2017-08-18 17:16 ` Stefan Beller
2017-08-18 19:10 ` Junio C Hamano
2017-08-18 22:04 ` [PATCH] pull: respect submodule update configuration Stefan Beller
2017-08-18 22:05 ` Stefan Beller
2017-08-19 6:17 ` Junio C Hamano
2017-08-19 6:24 ` Junio C Hamano
2017-08-21 16:20 ` Heiko Voigt
2017-08-21 16:55 ` Stefan Beller
2017-08-21 17:20 ` Lars Schneider
2017-08-21 17:48 ` Stefan Beller
2017-08-21 18:21 ` Brandon Williams
2017-08-21 22:52 ` Junio C Hamano [this message]
2017-08-22 14:50 ` Lars Schneider
2017-08-22 17:51 ` Stefan Beller
2017-08-22 18:55 ` Brandon Williams
2017-08-19 18:24 ` Submodule regression in 2.14? Lars Schneider
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=xmqqa82s5yau.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=bmwill@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
--cc=larsxschneider@gmail$(echo .)com \
--cc=sbeller@google$(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