From: Jonathan Nieder <jrnieder@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, gitster@pobox.com, Jens.Lehmann@web.de
Subject: Re: [PATCHv8 1/9] submodule-config: keep update strategy around
Date: Thu, 4 Feb 2016 16:59:46 -0800 [thread overview]
Message-ID: <20160205005946.GA19501@google.com> (raw)
In-Reply-To: <1454623776-3347-2-git-send-email-sbeller@google.com>
Hi,
It's been a while since I looked at this series. Hopefully I can
come at it with some fresh eyes. Thanks for your perseverance.
Stefan Beller wrote:
> We need the submodule update strategies in a later patch.
This description doesn't explain what the patch will do or why
parse_config didn't already retain the value. If I look back
at this patch later and want to understand why it was written,
what would I want to know?
It could say
Currently submodule.<name>.update is only handled by git-submodule.sh.
C code will start to need to make use of that value as more of the
functionality of git-submodule.sh moves into library code in C.
Add the update field to 'struct submodule' and populate it so it can
be read as sm->update.
[...]
> +++ b/submodule-config.c
> @@ -311,6 +312,16 @@ static int parse_config(const char *var, const char *value, void *data)
> free((void *) submodule->url);
> submodule->url = xstrdup(value);
> }
> + } else if (!strcmp(item.buf, "update")) {
> + if (!value)
> + ret = config_error_nonbool(var);
> + else if (!me->overwrite && submodule->update != NULL)
> + warn_multiple_config(me->commit_sha1, submodule->name,
> + "update");
> + else {
> + free((void *) submodule->update);
> + submodule->update = xstrdup(value);
> + }
(not about this patch) This code is repetitive. Would there be a way
to share code between the parsing of different per-submodule settings?
[...]
> --- a/submodule-config.h
> +++ b/submodule-config.h
> @@ -14,6 +14,7 @@ struct submodule {
> const char *url;
> int fetch_recurse;
> const char *ignore;
> + const char *update;
gitmodules(5) tells me the only allowed values are checkout, rebase,
merge, and none. I wouldn't know at a glance how to match against
those in calling code. Can this be an enum?
Thanks,
Jonathan
next prev parent reply other threads:[~2016-02-05 1:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 22:09 [PATCHv8 0/9] Expose submodule parallelism to the user Stefan Beller
2016-02-04 22:09 ` [PATCHv8 1/9] submodule-config: keep update strategy around Stefan Beller
2016-02-05 0:59 ` Jonathan Nieder [this message]
2016-02-05 20:25 ` Stefan Beller
2016-02-05 20:33 ` Jonathan Nieder
2016-02-05 20:36 ` Stefan Beller
2016-02-04 22:09 ` [PATCHv8 2/9] submodule-config: drop check against NULL Stefan Beller
2016-02-05 1:05 ` Jonathan Nieder
2016-02-04 22:09 ` [PATCHv8 3/9] submodule-config: remove name_and_item_from_var Stefan Beller
2016-02-06 0:46 ` Jonathan Nieder
2016-02-06 1:21 ` Stefan Beller
2016-02-04 22:09 ` [PATCHv8 4/9] submodule-config: slightly simplify lookup_or_create_by_name Stefan Beller
2016-02-06 0:48 ` Jonathan Nieder
2016-02-04 22:09 ` [PATCHv8 5/9] submodule-config: introduce parse_generic_submodule_config Stefan Beller
2016-02-06 1:23 ` Jonathan Nieder
2016-02-06 1:36 ` Stefan Beller
2016-02-04 22:09 ` [PATCHv8 6/9] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2016-02-05 3:29 ` Junio C Hamano
2016-02-05 18:50 ` Stefan Beller
2016-02-05 19:59 ` Junio C Hamano
2016-02-04 22:09 ` [PATCHv8 7/9] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-02-04 22:09 ` [PATCHv8 8/9] submodule update: expose parallelism to the user Stefan Beller
2016-02-04 22:09 ` [PATCHv8 9/9] clone: allow an explicit argument for parallel submodule clones Stefan Beller
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=20160205005946.GA19501@google.com \
--to=jrnieder@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).