Am 13.08.20 um 13:58 schrieb Jeff King:
> On Thu, Aug 13, 2020 at 01:11:18PM +0200, René Scharfe wrote:
>
>> Simplify the output code by splitting it up and reducing duplication.
>> Reuse the logic for printing object IDs -- anonymized if needed -- by
>> moving it to its own function, print_oid().
>
> Looks sane overall, though somehow we added 4 extra lines while reducing
> duplication. ;)
Yeah, but they are shorter. :)
>
>> +static void print_oid(const struct object_id *oid, int anonymize)
>> +{
>> + const char *oid_hex = oid_to_hex(oid);
>> + if (anonymize)
>> + oid_hex = anonymize_oid(oid_hex);
>> + fputs(oid_hex, stdout);
>> +}
>
> Would anyone ever pass anything except the global "anonymize" into this
> function (certainly neither of the new callers does). I get that it
> takes us on a possible road towards moving the globals to locals, but in
> the meantime, shadowing the global name just seems more confusing to me.
Good point.
>
>> @@ -470,21 +478,19 @@ static void show_filemodify(struct diff_queue_struct *q,
>> case DIFF_STATUS_TYPE_CHANGED:
>> case DIFF_STATUS_MODIFIED:
>> case DIFF_STATUS_ADDED:
>> + printf("M %06o ", spec->mode);
>
> This makes the output a bit more lego-like (i.e., hard to see what the
> full line will look like from the code), but it already was pretty
> bad because of using print_path(). I think that's fine.
Yes, it was almost halfway to all-out lego style before, and the
patch moves it further in that direction.
>
>> @@ -724,12 +730,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
>> else
>> printf("merge ");
>> if (mark)
>> - printf(":%d\n", mark);
>> + printf(":%d", mark);
>
> This line gets repeated, too. I guess we could have a print_mark(), but
> there is really no logic here except "put a colon in front of it", so
> probably not worthwhile.
Right.
René
