From: Junio C Hamano <gitster@pobox.com>
To: Brandon Williams <bmwill@google.com>
Cc: git@vger.kernel.org, sbeller@google.com, jrnieder@gmail.com,
Jens.Lehmann@web.de
Subject: Re: [PATCH v2 08/15] unpack-trees: don't respect submodule.update
Date: Thu, 03 Aug 2017 13:37:10 -0700 [thread overview]
Message-ID: <xmqqpoccwfpl.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170803182000.179328-9-bmwill@google.com> (Brandon Williams's message of "Thu, 3 Aug 2017 11:19:53 -0700")
Brandon Williams <bmwill@google.com> writes:
> The 'submodule.update' config was historically used and respected by the
> 'submodule update' command because update handled a variety of different
> ways it updated a submodule. As we begin teaching other commands about
> submodules it makes more sense for the different settings of
> 'submodule.update' to be handled by the individual commands themselves
> (checkout, rebase, merge, etc) so it shouldn't be respected by the
> native checkout command.
Soooo... what's the externally observable effect of this change? Is
it something that can be illustrated in a set of new tests?
IOW does this commit by itself want to change the behaviour of
"submodule update" and existing (indirect) users of unpack-trees?
Or does it want to keep the documented behaviour of "submodule
update" while correcting unintended triggering in other (indirect)
users of unpack-trees of the same machinery that is being removed in
this patch?
> - switch (sub->update_strategy.type) {
> - case SM_UPDATE_UNSPECIFIED:
> - case SM_UPDATE_CHECKOUT:
> - if (submodule_move_head(ce->name, old_id, new_id, flags))
> - return o->gently ? -1 :
> - add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
> - return 0;
> - case SM_UPDATE_NONE:
> - return 0;
> - case SM_UPDATE_REBASE:
> - case SM_UPDATE_MERGE:
> - case SM_UPDATE_COMMAND:
> - default:
> - warning(_("submodule update strategy not supported for submodule '%s'"), ce->name);
> - return -1;
> - }
> + if (submodule_move_head(ce->name, old_id, new_id, flags))
> + return o->gently ? -1 :
> + add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
> + return 0;
With this update, we always behave as if update_strategy.type were
either left unspecified or explicitly set to checkout. Other arms
in this switch (and the other switch too), especially "none", were
not expecting a call to submodule_move_head() to be made, but now
the call is unconditional.
> }
>
> static void reload_gitmodules_file(struct index_state *index,
> @@ -293,7 +282,6 @@ static void reload_gitmodules_file(struct index_state *index,
> submodule_free();
> checkout_entry(ce, state, NULL);
> gitmodules_config();
> - git_config(submodule_config, NULL);
> } else
> break;
> }
> @@ -308,19 +296,9 @@ static void unlink_entry(const struct cache_entry *ce)
> {
> const struct submodule *sub = submodule_from_ce(ce);
> if (sub) {
> - switch (sub->update_strategy.type) {
> - case SM_UPDATE_UNSPECIFIED:
> - case SM_UPDATE_CHECKOUT:
> - case SM_UPDATE_REBASE:
> - case SM_UPDATE_MERGE:
> - /* state.force is set at the caller. */
> - submodule_move_head(ce->name, "HEAD", NULL,
> - SUBMODULE_MOVE_HEAD_FORCE);
> - break;
> - case SM_UPDATE_NONE:
> - case SM_UPDATE_COMMAND:
> - return; /* Do not touch the submodule. */
> - }
> + /* state.force is set at the caller. */
> + submodule_move_head(ce->name, "HEAD", NULL,
> + SUBMODULE_MOVE_HEAD_FORCE);
> }
> if (!check_leading_path(ce->name, ce_namelen(ce)))
> return;
next prev parent reply other threads:[~2017-08-03 20:37 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 21:39 [PATCH 00/15] submodule-config cleanup Brandon Williams
2017-07-25 21:39 ` [PATCH 01/15] t7411: check configuration parsing errors Brandon Williams
2017-07-26 20:56 ` Junio C Hamano
2017-07-25 21:39 ` [PATCH 02/15] submodule: don't use submodule_from_name Brandon Williams
2017-07-25 23:17 ` Stefan Beller
2017-07-26 21:06 ` Junio C Hamano
2017-07-30 13:43 ` Jens Lehmann
2017-07-30 21:25 ` Junio C Hamano
2017-07-31 20:43 ` Stefan Beller
2017-08-11 16:53 ` Heiko Voigt
2017-07-25 21:39 ` [PATCH 03/15] add, reset: ensure submodules can be added or reset Brandon Williams
2017-07-25 23:33 ` Stefan Beller
2017-07-25 23:37 ` Brandon Williams
2017-07-26 21:25 ` Junio C Hamano
2017-07-31 20:50 ` Brandon Williams
2017-07-25 21:39 ` [PATCH 04/15] submodule--helper: don't overlay config in remote_submodule_branch Brandon Williams
2017-07-25 23:35 ` Stefan Beller
2017-07-25 21:39 ` [PATCH 05/15] submodule--helper: don't overlay config in update-clone Brandon Williams
2017-07-25 23:37 ` Stefan Beller
2017-07-25 23:39 ` Brandon Williams
2017-07-25 21:39 ` [PATCH 06/15] fetch: don't overlay config with submodule-config Brandon Williams
2017-07-25 23:44 ` Stefan Beller
2017-07-25 23:48 ` Brandon Williams
2017-07-25 21:39 ` [PATCH 07/15] submodule: don't rely on overlayed config when setting diffopts Brandon Williams
2017-07-25 23:46 ` Stefan Beller
2017-07-25 21:39 ` [PATCH 08/15] unpack-trees: don't rely on overlayed config Brandon Williams
2017-07-25 21:39 ` [PATCH 09/15] submodule: remove submodule_config callback routine Brandon Williams
2017-07-26 21:31 ` Junio C Hamano
2017-07-25 21:39 ` [PATCH 10/15] diff: stop allowing diff to have submodules configured in .git/config Brandon Williams
2017-07-25 21:39 ` [PATCH 11/15] submodule-config: remove support for overlaying repository config Brandon Williams
2017-07-25 21:39 ` [PATCH 12/15] submodule-config: move submodule-config functions to submodule-config.c Brandon Williams
2017-07-25 21:39 ` [PATCH 13/15] submodule-config: lazy-load a repository's .gitmodules file Brandon Williams
2017-07-25 21:39 ` [PATCH 14/15] unpack-trees: improve loading of .gitmodules Brandon Williams
2017-07-25 21:39 ` [PATCH 15/15] submodule: remove gitmodules_config Brandon Williams
2017-08-03 18:19 ` [PATCH v2 00/15] submodule-config cleanup Brandon Williams
2017-08-03 18:19 ` [PATCH v2 01/15] t7411: check configuration parsing errors Brandon Williams
2017-08-03 18:19 ` [PATCH v2 02/15] submodule: don't use submodule_from_name Brandon Williams
2017-08-03 18:57 ` Stefan Beller
2017-08-04 21:53 ` Brandon Williams
2017-08-11 16:59 ` Heiko Voigt
2017-08-03 20:17 ` Junio C Hamano
2017-08-03 18:19 ` [PATCH v2 03/15] add, reset: ensure submodules can be added or reset Brandon Williams
2017-08-03 18:19 ` [PATCH v2 04/15] submodule--helper: don't overlay config in remote_submodule_branch Brandon Williams
2017-08-03 18:19 ` [PATCH v2 05/15] submodule--helper: don't overlay config in update-clone Brandon Williams
2017-08-03 18:19 ` [PATCH v2 06/15] fetch: don't overlay config with submodule-config Brandon Williams
2017-08-03 18:19 ` [PATCH v2 07/15] submodule: don't rely on overlayed config when setting diffopts Brandon Williams
2017-08-03 18:19 ` [PATCH v2 08/15] unpack-trees: don't respect submodule.update Brandon Williams
2017-08-03 20:26 ` Stefan Beller
2017-08-03 20:37 ` Junio C Hamano [this message]
2017-08-03 20:43 ` Stefan Beller
2017-08-03 18:19 ` [PATCH v2 09/15] submodule: remove submodule_config callback routine Brandon Williams
2017-08-03 18:19 ` [PATCH v2 10/15] diff: stop allowing diff to have submodules configured in .git/config Brandon Williams
2017-08-03 20:40 ` Junio C Hamano
2017-08-04 21:59 ` Brandon Williams
2017-08-03 18:19 ` [PATCH v2 11/15] submodule-config: remove support for overlaying repository config Brandon Williams
2017-08-03 18:19 ` [PATCH v2 12/15] submodule-config: move submodule-config functions to submodule-config.c Brandon Williams
2017-08-03 18:19 ` [PATCH v2 13/15] submodule-config: lazy-load a repository's .gitmodules file Brandon Williams
2017-08-03 18:19 ` [PATCH v2 14/15] unpack-trees: improve loading of .gitmodules Brandon Williams
2017-08-11 17:18 ` Heiko Voigt
2017-08-03 18:20 ` [PATCH v2 15/15] submodule: remove gitmodules_config Brandon Williams
2017-08-03 20:09 ` [PATCH v2 00/15] submodule-config cleanup Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpoccwfpl.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).