Subject: Re: [PATCH 22/33] notes-merge: convert notes_merge* to struct object_id

From: Junio C Hamano <[email-masked]>
Date: Fri, 02 Jun 2017 10:13:38 +0900

"brian m. carlson" <[email-masked]> writes:

>> diff --git a/notes-merge.h b/notes-merge.h
>> index 0d890563b..eaa8e3b86 100644
>> --- a/notes-merge.h
>> +++ b/notes-merge.h
>> @@ -33,15 +33,15 @@ void init_notes_merge_options(struct notes_merge_options *o);
>>   *
>>   * 1. The merge trivially results in an existing commit (e.g. fast-forward or
>>   *    already-up-to-date). 'local_tree' is untouched, the SHA1 of the result
>> - *    is written into 'result_sha1' and 0 is returned.
>> + *    is written into 'result_oid' and 0 is returned.
>>   * 2. The merge successfully completes, producing a merge commit. local_tree
>>   *    contains the updated notes tree, the SHA1 of the resulting commit is
>> - *    written into 'result_sha1', and 1 is returned.
>> + *    written into 'result_oid', and 1 is returned.
>>   * 3. The merge results in conflicts. This is similar to #2 in that the
>>   *    partial merge result (i.e. merge result minus the unmerged entries)
>>   *    are stored in 'local_tree', and the SHA1 or the resulting commit
>>   *    (to be amended when the conflicts have been resolved) is written into
>> - *    'result_sha1'. The unmerged entries are written into the
>> + *    'result_oid'. The unmerged entries are written into the
>>   *    .git/NOTES_MERGE_WORKTREE directory with conflict markers.
>>   *    -1 is returned.
>>   *
>
> Did you want to change the comment to say "object ID" or "OID" instead
> of "SHA1" like you did in an earlier patch?

Yes, that's a good suggestion.  Will queue a trivial squash on top.