From: Jonas Fonseca <fonseca@diku.dk>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Improve parent blame to detect renames by using the previous information
Date: Wed, 9 Jun 2010 22:23:56 -0400 [thread overview]
Message-ID: <AANLkTilpMcHi4ZrrEmG4hi3TVo1IK4C-skq8cRADvAPf@mail.gmail.com> (raw)
In-Reply-To: <20100606223545.GA11424@coredump.intra.peff.net>
On Sun, Jun 6, 2010 at 18:35, Jeff King <peff@peff.net> wrote:
> On Sat, Jun 05, 2010 at 03:56:05PM -0400, Jonas Fonseca wrote:
>
> So I think it does the right thing, and I see you also included my fix:
>
>> + char from[SIZEOF_REF + SIZEOF_STR];
>> + char to[SIZEOF_REF + SIZEOF_STR];
>> const char *diff_tree_argv[] = {
>> - "git", "diff-tree", "-U0", blame->commit->id,
>> - "--", blame->commit->filename, NULL
>> + "git", "diff", "--no-textconv", "--no-extdiff", "--no-color",
>> + "-U0", from, to, "--", NULL
>> };
>> struct io io;
>> int parent_lineno = -1;
>> int blamed_lineno = -1;
>> char *line;
>>
>> + snprintf(from, sizeof(from), "%s:%s", opt_ref, opt_file);
>> + snprintf(to, sizeof(to), "%s:%s", blame->commit->id,
>> + blame->commit->filename);
>> +
>
> to handle the line-jumping properly.
Yes, I accidently squashed everything together in the patch I sent.
Before pushing the final version I move this part to a separate commit
with you as the author and made it use string_format.
--
Jonas Fonseca
prev parent reply other threads:[~2010-06-10 2:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 8:55 [tig PATCH] fix off-by-one on parent selection Jeff King
2010-05-22 17:19 ` Jonas Fonseca
2010-05-23 7:40 ` Jeff King
2010-05-23 7:55 ` Jeff King
2010-06-05 19:56 ` [PATCH] Improve parent blame to detect renames by using the previous information Jonas Fonseca
2010-06-05 19:57 ` [TIG PATCH] " Jonas Fonseca
2010-06-06 22:35 ` [PATCH] " Jeff King
2010-06-09 16:10 ` Jonas Fonseca
2010-06-10 2:23 ` Jonas Fonseca [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
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=AANLkTilpMcHi4ZrrEmG4hi3TVo1IK4C-skq8cRADvAPf@mail.gmail.com \
--to=fonseca@diku.dk \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).