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

2017-05-30 Thread Brandon Williams
Convert notes_merge and notes_merge_commit to use struct object_id. Signed-off-by: Brandon Williams --- builtin/notes.c | 6 +++--- notes-merge.c | 58 - notes-merge.h | 12 ++-- 3 files changed, 38 insertions(+), 38 deletions

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

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:30 AM, Brandon Williams wrote: > Convert notes_merge and notes_merge_commit to use struct object_id. > > > Signed-off-by: Brandon Williams spurious new line before sign off.

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

2017-05-31 Thread brian m. carlson
On Tue, May 30, 2017 at 10:30:58AM -0700, Brandon Williams wrote: > @@ -596,47 +596,47 @@ int notes_merge(struct notes_merge_options *o, > /* Find merge bases */ > bases = get_merge_bases(local, remote); > if (!bases) { > - base_sha1 = null_sha1; > - base_t

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

2017-06-01 Thread Junio C Hamano
"brian m. carlson" 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 e

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

2017-06-02 Thread Brandon Williams
On 05/31, brian m. carlson wrote: > On Tue, May 30, 2017 at 10:30:58AM -0700, Brandon Williams wrote: > > @@ -596,47 +596,47 @@ int notes_merge(struct notes_merge_options *o, > > /* Find merge bases */ > > bases = get_merge_bases(local, remote); > > if (!bases) { > > - base_sh