From: Stefan Beller <sbeller@google.com>
To: Brandon Williams <bmwill@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH 5/6] submodule: improve submodule_has_commits
Date: Fri, 28 Apr 2017 17:28:14 -0700 [thread overview]
Message-ID: <CAGZ79kZzpyw0ijiM12TwMHAx1Ung-xKPEm2rVY9803hvk=+UMQ@mail.gmail.com> (raw)
In-Reply-To: <20170428235402.162251-6-bmwill@google.com>
On Fri, Apr 28, 2017 at 4:54 PM, Brandon Williams <bmwill@google.com> wrote:
> Teach 'submodule_has_commits()' to ensure that if a commit exists in a
> submodule, that it is also reachable from a ref.
>
> This is a prepritory step prior to merging the logic which checkes for
s/prepritory/preparatory/
s/checkes/checks/
This is the first commit in the series that changes user observable behavior,
I guess there will be tests in a later patch? Can you elaborate in this commit
message more about why it is useful (or at least harmless for performing
this check in the case of fetch/push)?
> diff --git a/submodule.c b/submodule.c
> index 3bcf44521..100d31d39 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -648,6 +648,30 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)
> return 0;
>
> oid_array_for_each_unique(commits, check_has_commit, &has_commit);
> +
> + if (has_commit) {
> + /*
> + * Even if the submodule is checked out and the commit is
> + * present, make sure it is reachable from a ref.
> + */
> + struct child_process cp = CHILD_PROCESS_INIT;
> + struct strbuf out = STRBUF_INIT;
> +
> + argv_array_pushl(&cp.args, "rev-list", "-n", "1", NULL);
> + oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
> + argv_array_pushl(&cp.args, "--not", "--all", NULL);
> +
> + prepare_submodule_repo_env(&cp.env_array);
> + cp.git_cmd = 1;
> + cp.no_stdin = 1;
> + cp.dir = path;
> +
> + if (capture_command(&cp, &out, 1024) || out.len)
> + has_commit = 0;
So if we fail to launch capture_command, we assume we do not
have the commits?
capture_command can fail for reasons that are hard to track down
or even spurious (OOM due to excessive output, disk failure,
corrupt repo, error in executing the process, getting a signal and
so on), some of them are ok to ignore, others should never be ignored.
So I'd rather die on capture_command, and inspect out.len only
in case of successful capturing.
In addition to that we're only interested if there is any output,
such that we can optimize further:
c.f. http://public-inbox.org/git/20170324223848.GH31294@aiede.mtv.corp.google.com/
if (start_command(&cp))
die("cannot start git-rev-list in submodule'%s', sub->path);
/* read only one character, if any */
if (xread(cp.out, &tmp, 1);
has_commit = 0;
/*
* close cp.out, such that the child may get SIGPIPE, upon which
* it dies (silently, maybe we need to suppress cp.err ?)
*/
close(cp.out);
/*
* Though we need to be nitpicky about finish_command IIUC by now:
* TODO(sbeller): if this turns out to be true, fixup is_submodule_modified
*/
int code = finish_command(&cp);
if (!code && code != 128 + SIGPIPE)
die("git rev-list failed in submodule'%s'", sub->path);
Upon rereading the patch, I notice the '-n 1', which would make the
optimized code above useless, so just consider it food for thought.
Thanks,
Stefan
next prev parent reply other threads:[~2017-04-29 0:28 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 23:53 [PATCH 0/6] changed submodules Brandon Williams
2017-04-28 23:53 ` [PATCH 1/6] submodule: rename add_sha1_to_array Brandon Williams
2017-05-01 3:18 ` Junio C Hamano
2017-04-28 23:53 ` [PATCH 2/6] submodule: rename free_submodules_sha1s Brandon Williams
2017-04-28 23:53 ` [PATCH 3/6] submodule: remove add_oid_to_argv Brandon Williams
2017-04-28 23:54 ` [PATCH 4/6] submodule: change string_list changed_submodule_paths Brandon Williams
2017-05-01 3:28 ` Junio C Hamano
2017-05-01 16:35 ` Brandon Williams
2017-04-28 23:54 ` [PATCH 5/6] submodule: improve submodule_has_commits Brandon Williams
2017-04-29 0:28 ` Stefan Beller [this message]
2017-04-30 23:14 ` Brandon Williams
2017-05-01 16:52 ` Stefan Beller
2017-05-01 16:55 ` Brandon Williams
2017-05-01 3:37 ` Junio C Hamano
2017-05-01 16:46 ` Brandon Williams
2017-04-28 23:54 ` [PATCH 6/6] submodule: refactor logic to determine changed submodules Brandon Williams
2017-04-29 0:53 ` Stefan Beller
2017-05-01 16:49 ` Brandon Williams
2017-05-01 1:42 ` [PATCH 0/6] " Junio C Hamano
2017-05-02 1:02 ` [PATCH v2 " Brandon Williams
2017-05-02 1:02 ` [PATCH v2 1/6] submodule: rename add_sha1_to_array Brandon Williams
2017-05-02 1:05 ` Stefan Beller
2017-05-02 1:09 ` Brandon Williams
2017-05-02 1:02 ` [PATCH v2 2/6] submodule: rename free_submodules_sha1s Brandon Williams
2017-05-02 1:02 ` [PATCH v2 3/6] submodule: remove add_oid_to_argv Brandon Williams
2017-05-02 1:02 ` [PATCH v2 4/6] submodule: change string_list changed_submodule_paths Brandon Williams
2017-05-02 1:02 ` [PATCH v2 5/6] submodule: improve submodule_has_commits Brandon Williams
2017-05-02 1:34 ` Stefan Beller
2017-05-02 17:25 ` Brandon Williams
2017-05-02 17:55 ` Stefan Beller
2017-05-02 19:14 ` Brandon Williams
2017-05-02 19:30 ` Brandon Williams
2017-05-02 1:02 ` [PATCH v2 6/6] submodule: refactor logic to determine changed submodules Brandon Williams
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='CAGZ79kZzpyw0ijiM12TwMHAx1Ung-xKPEm2rVY9803hvk=+UMQ@mail.gmail.com' \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
/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).