Re: [PATCH v4 12/14] fix 'git update-index --verbose --again' output
Am 07.11.2013 23:12, schrieb Junio C Hamano:
Show 12 quoted lines
> Karsten Blees <karsten.blees@gmail.com> writes:
>
>> 'git update-index --verbose' consistently reports paths relative to the
>> work-tree root. The only exception is the '--again' option, which reports
>> paths relative to the current working directory.
>>
>> Change do_reupdate to use non-prefixed paths.
>
> Interesting.
>
> This looks like a genuine fix unrelated to the use of the new hashmap.
>
Indeed, #13 as well (and #4, #5, for that matter). I stumbled across this when analysing Thomas' last valgrind report.
Note that #12, #13 are prequels to #14, which adds a "char *path = xstrdup(ce->name); ... free(path)" around the update_one call.
Show 19 quoted lines
>>
>> Signed-off-by: Karsten Blees <blees@dcon.de>
>> ---
>> builtin/update-index.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/builtin/update-index.c b/builtin/update-index.c
>> index e3a10d7..d180d80 100644
>> --- a/builtin/update-index.c
>> +++ b/builtin/update-index.c
>> @@ -579,7 +579,7 @@ static int do_reupdate(int ac, const char **av,
>> * or worse yet 'allow_replace', active_nr may decrease.
>> */
>> save_nr = active_nr;
>> - update_one(ce->name + prefix_length, prefix, prefix_length);
>> + update_one(ce->name, NULL, 0);
>> if (save_nr != active_nr)
>> goto redo;
>> }
Karsten Blees <karsten.blees@gmail.com>