From: Derrick Stolee <stolee@gmail.com>
To: Michael Forney <mforney@mforney.org>, git@vger.kernel.org
Subject: Re: [PATCH 1/2] revision: use repository from rev_info when parsing commits
Date: Wed, 24 Jun 2020 10:29:41 -0400 [thread overview]
Message-ID: <88d8b24c-a0ae-bbbf-dd1f-5adb7a36ee95@gmail.com> (raw)
In-Reply-To: <20200623205659.14297-1-mforney@mforney.org>
On 6/23/2020 4:56 PM, Michael Forney wrote:
> This is needed when repo_init_revisions() is called with a repository
> that is not the_repository to ensure appropriate repository is used
> in repo_parse_commit_internal(). If the wrong repository is used,
> a fatal error is the commit-graph machinery occurs:
>
> fatal: invalid commit position. commit-graph is likely corrupt
>
> Since revision.c was the only user of the parse_commit_gently
> compatibility define, remove it from commit.h.
Is this demonstrable in a test case, to prevent regressions?
Notably, you are _not_ dropping parse_commit(), and it would be
easy for another call to that shim to slip into revision.c.
> Signed-off-by: Michael Forney <mforney@mforney.org>
> ---
> commit.h | 1 -
> revision.c | 18 +++++++++---------
> 2 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/commit.h b/commit.h
> -#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
I'm happy we can drop this shim!
> diff --git a/revision.c b/revision.c
> index ebb4d2a0f2..2b6bf47c81 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -439,7 +439,7 @@ static struct commit *handle_commit(struct rev_info *revs,
> if (object->type == OBJ_COMMIT) {
> struct commit *commit = (struct commit *)object;
>
> - if (parse_commit(commit) < 0)
> + if (repo_parse_commit(revs->repo, commit) < 0)
I counted 9 copies of parse_commit[_gently]() in my version
of revision.c, so it looks like you caught them all.
Thanks!
-Stolee
next prev parent reply other threads:[~2020-06-24 14:29 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
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 [this message]
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=88d8b24c-a0ae-bbbf-dd1f-5adb7a36ee95@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).