From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, jrnieder@gmail.com, Jens.Lehmann@web.de
Subject: Re: [PATCHv11 1/7] submodule-config: keep update strategy around
Date: Thu, 18 Feb 2016 11:28:12 -0800 [thread overview]
Message-ID: <xmqq37sphl83.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1455320080-14648-2-git-send-email-sbeller@google.com> (Stefan Beller's message of "Fri, 12 Feb 2016 15:34:34 -0800")
Stefan Beller <sbeller@google.com> writes:
> @@ -340,6 +342,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_strategy.type != SM_UPDATE_UNSPECIFIED)
> + warn_multiple_config(me->commit_sha1, submodule->name,
> + "update");
> + else if (parse_submodule_update_strategy(value,
> + &submodule->update_strategy) < 0)
> + die(_("invalid value for %s"), var);
Mental note. This takes "value" that comes from the config API; the
pre-context in this hunk treats it as a transient piece of memory
and uses xstrdup() on it before storing it away in submodule->url.
> +int parse_submodule_update_strategy(const char *value,
> + struct submodule_update_strategy *dst)
> +{
> + dst->command = NULL;
> + if (!strcmp(value, "none"))
> + dst->type = SM_UPDATE_NONE;
> + else if (!strcmp(value, "checkout"))
> + dst->type = SM_UPDATE_CHECKOUT;
> + else if (!strcmp(value, "rebase"))
> + dst->type = SM_UPDATE_REBASE;
> + else if (!strcmp(value, "merge"))
> + dst->type = SM_UPDATE_MERGE;
> + else if (skip_prefix(value, "!", &dst->command))
> + dst->type = SM_UPDATE_COMMAND;
This however uses skip_prefix() on value, making dst->command store
a pointer into that transient piece of memory.
That looks inconsistent, doesn't it? I think this part should be
else if (value[0] == '!') {
dst->type = SM_UPDATE_COMMAND;
dst->command = xstrdup(value + 1);
}
or something like that. I.e. dst->command should own the piece of
memory it points at, no?
next prev parent reply other threads:[~2016-02-18 19:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-12 23:34 [PATCHv11 0/7] Expose submodule parallelism to the user Stefan Beller
2016-02-12 23:34 ` [PATCHv11 1/7] submodule-config: keep update strategy around Stefan Beller
2016-02-18 19:28 ` Junio C Hamano [this message]
2016-02-12 23:34 ` [PATCHv11 2/7] submodule-config: drop check against NULL Stefan Beller
2016-02-12 23:34 ` [PATCHv11 3/7] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2016-02-12 23:34 ` [PATCHv11 4/7] submodule update: direct error message to stderr Stefan Beller
2016-02-12 23:34 ` [PATCHv11 5/7] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-02-12 23:34 ` [PATCHv11 6/7] submodule update: expose parallelism to the user Stefan Beller
2016-02-12 23:34 ` [PATCHv11 7/7] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2016-02-18 19:46 ` [PATCHv11 0/7] Expose submodule parallelism to the user 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=xmqq37sphl83.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--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).