Stefan Beller <sbeller@xxxxxxxxxx> writes:
>> trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, "
>> - "remote = %.7s)\n", sha1_to_hex(base), sha1_to_hex(local),
>> - sha1_to_hex(remote));
>> + "remote = %.7s)\n", oid_to_hex(base), oid_to_hex(local),
>> + oid_to_hex(remote));
>
> This part is interesting.
>
> 7 used to be the default abbreviation length for sha1s (see
> e6c587c733 (abbrev: auto size the default abbreviation, 2016-09-30)
> for details) and this may have been a left over from the conversion
> to variable length abbreviated hashes. This could be a reminder
> we want to fix these, too. (Though not in this series?).
>
> Roughly like
>
> trace_printf("\tmerge_from_diffs(base = %s, local = %s, remote = %s)\n",
> find_unique_abbrev(base.hash, DEFAULT_ABBREV),
> find_unique_abbrev(local.hash, DEFAULT_ABBREV)
> find_unique_abbrev(remote.hash, DEFAULT_ABBREV));
Sharp eyes ;-) As you said, this is definitely outside the scope of
this series.