On Tue, May 30, 2017 at 10:31 AM, Brandon Williams <bmwill@xxxxxxxxxx> wrote:
>
> Signed-off-by: Brandon Williams <bmwill@xxxxxxxxxx>
> ---
> notes-merge.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/notes-merge.c b/notes-merge.c
> index 55dbb3659..962e9b1bc 100644
> --- a/notes-merge.c
> +++ b/notes-merge.c
> @@ -22,21 +22,21 @@ void init_notes_merge_options(struct notes_merge_options *o)
> o->verbosity = NOTES_MERGE_VERBOSITY_DEFAULT;
> }
>
> -static int path_to_sha1(const char *path, unsigned char *sha1)
> +static int path_to_oid(const char *path, struct object_id *oid)
> {
> - char hex_sha1[40];
> + char hex_oid[GIT_SHA1_HEXSZ];
Here we better use GIT_MAX_HEXSZ ?