Re: [PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-06-02 Thread Junio C Hamano
Brandon Williams writes: > On 06/02, Junio C Hamano wrote: >> >> > -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]; >> >int i = 0; >>

Re: [PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-06-02 Thread Brandon Williams
On 06/02, Junio C Hamano wrote: > Brandon Williams writes: > > > Signed-off-by: Brandon Williams > > --- > > 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 >

Re: [PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-06-01 Thread Junio C Hamano
Brandon Williams writes: > Signed-off-by: Brandon Williams > --- > 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

Re: [PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:31 AM, Brandon Williams wrote: > > Signed-off-by: Brandon Williams > --- > 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-merg

[PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-05-30 Thread Brandon Williams
Signed-off-by: Brandon Williams --- 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(s