From: Derrick Stolee <stolee@gmail.com>
To: Michael Forney <mforney@mforney.org>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] submodule: use submodule repository when preparing summary
Date: Wed, 24 Jun 2020 10:35:30 -0400 [thread overview]
Message-ID: <33de1078-5f19-e76c-2a30-1754494d1e31@gmail.com> (raw)
In-Reply-To: <20200623205659.14297-2-mforney@mforney.org>
On 6/23/2020 4:56 PM, Michael Forney wrote:
> In show_submodule_header(), we gather the left and right commits
> of the submodule repository, as well as the merge bases. However,
> prepare_submodule_summary() initializes the rev_info with the_repository,
> so we end up parsing the commit in the wrong repository.
>
> This results in a fatal error in parse_commit_in_graph(), since the
> passed item does not belong to the repository's commit graph.
>
> Signed-off-by: Michael Forney <mforney@mforney.org>
> ---
> submodule.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/submodule.c b/submodule.c
> index e2ef5698c8..785ab47629 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -438,13 +438,13 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
> */
> }
>
> -static int prepare_submodule_summary(struct rev_info *rev, const char *path,
> - struct commit *left, struct commit *right,
> +static int prepare_submodule_summary(struct repository *r, struct rev_info *rev,
> + const char *path, struct commit *left, struct commit *right,
> struct commit_list *merge_bases)
> {
> struct commit_list *list;
>
> - repo_init_revisions(the_repository, rev, NULL);
> + repo_init_revisions(r, rev, NULL);
This is how we properly initialize the repository in the rev_info.
It's unfortunate that this use of the_repository was pretty clearly
incorrect. This is submodule.c, so every instance of the_repository
should be examined carefully. Taking a brief look right now, the
rest seem to be correct in that they are finding submodules within
the super-repo. The only issue will arise when recursing into
submodules, which is known to be broken in-process and are handled
with subprocesses instead.
> setup_revisions(0, NULL, rev, NULL);
> rev->left_right = 1;
> rev->first_parent_only = 1;
> @@ -632,7 +632,7 @@ void show_submodule_summary(struct diff_options *o, const char *path,
> goto out;
>
> /* Treat revision walker failure the same as missing commits */
> - if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
> + if (prepare_submodule_summary(sub, &rev, path, left, right, merge_bases)) {
> diff_emit_submodule_error(o, "(revision walker failed)\n");
> goto out;
> }
Perhaps the test I requested in patch 1 is only appropriate
here? Or, maybe the test should be test_expect_failure in the
first patch and switched to test_expect_success here?
Thanks,
-Stolee
next prev parent reply other threads:[~2020-06-24 14:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 20:56 [PATCH 1/2] revision: use repository from rev_info when parsing commits Michael Forney
2020-06-23 20:56 ` [PATCH 2/2] submodule: use submodule repository when preparing summary Michael Forney
2020-06-24 14:35 ` Derrick Stolee [this message]
2020-06-24 16:12 ` Junio C Hamano
2020-06-30 11:04 ` Michael Forney
2020-08-13 21:16 ` Michael Forney
2020-06-23 21:24 ` [PATCH 1/2] revision: use repository from rev_info when parsing commits Eric Sunshine
2020-06-24 14:29 ` Derrick Stolee
2020-09-03 21:58 ` Junio C Hamano
2020-09-04 12:19 ` Derrick Stolee
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=33de1078-5f19-e76c-2a30-1754494d1e31@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=mforney@mforney.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.
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 NNTP newsgroup(s).