From: Christian Couder <chriscool@tuxfamily.org>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git <git@vger.kernel.org>
Subject: Re: [RFC/PATCH 2/2] blame: fix output in case of replacement by using parse_commit_repl()
Date: Tue, 17 Aug 2010 08:16:18 +0200 [thread overview]
Message-ID: <201008170816.18600.chriscool@tuxfamily.org> (raw)
In-Reply-To: <AANLkTimMXmi1ZhVYXtbMz3doOUZMzbRggqcUY0L7wKyY@mail.gmail.com>
On Tuesday 17 August 2010 05:44:11 Nguyen Thai Ngoc Duy wrote:
> On Tue, Aug 17, 2010 at 11:59 AM, Christian Couder
>
> <chriscool@tuxfamily.org> wrote:
> > git blame was not showing the sha1 of the replacement commit while
> > it was properly showing other information from the replacement commit,
> > because parse_commit() is buggy regarding replacement.
> >
> > Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> > ---
> > builtin/blame.c | 4 ++--
> > t/t6050-replace.sh | 8 ++++++++
> > 2 files changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/builtin/blame.c b/builtin/blame.c
> > index 8f9e7b0..c469e09 100644
> > --- a/builtin/blame.c
> > +++ b/builtin/blame.c
> > @@ -1226,7 +1226,7 @@ static void pass_blame(struct scoreboard *sb,
> > struct origin *origin, int opt)
> >
> > if (sg_origin[i])
> > continue;
> > - if (parse_commit(p))
> > + if (parse_commit_repl(&p))
>
> This is the hard way. There are another ~40 parse_commit() calls
> elsewhere. Most of them are in git commands, so we can check one by
> one. There are some calls in revision.c, sha1_name.c, tree.c,
> upload-pack.c and walker.c, which may be used in many places. Checking
> them would be harder.
Yeah, I will try to provide test cases but it may not be possible in some
cases.
Best regards,
Christian.
prev parent reply other threads:[~2010-08-17 6:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 1:59 [RFC/PATCH 2/2] blame: fix output in case of replacement by using parse_commit_repl() Christian Couder
2010-08-17 3:44 ` Nguyen Thai Ngoc Duy
2010-08-17 6:16 ` Christian Couder [this message]
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=201008170816.18600.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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.
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).