From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 10 Jun 2010 02:23:56 GMT
Subject: Re: [PATCH] Improve parent blame to detect renames by using the previous information
Message-ID: <AANLkTilpMcHi4ZrrEmG4hi3TVo1IK4C-skq8cRADvAPf@mail.gmail.com>
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