Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-17 Thread Junio C Hamano
Jacob Keller jacob.kel...@gmail.com writes: Sorry, but I lost track. Do I understand correctly the consensus on the previous discussion? My understanding is: (1) We do not currently refuse to merge notes into anywhere outside of refs/notes/; We do. I mis understood the original

Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-17 Thread Junio C Hamano
Jacob Keller jacob.kel...@gmail.com writes: How do you feel about having the duplicate check for the short_ref? We *already* check this inside init_notes_check() which is called right after this. I thought you were trying to enforce a new rule (i.e. must be under refs/notes/) with this, but

Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-15 Thread Johan Herland
On Fri, Aug 14, 2015 at 11:13 PM, Jacob Keller jacob.e.kel...@intel.com wrote: From: Jacob Keller jacob.kel...@gmail.com Add new option notes.ref.mergestrategy option which specifies the merge strategy for merging into a given notes ref. This option enables selection of merge strategy for

Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.e.kel...@intel.com writes: diff --git a/builtin/notes.c b/builtin/notes.c index 12a42b583f98..bdfd9c7d29b4 100644 --- a/builtin/notes.c +++ b/builtin/notes.c + strbuf_addf(merge_key,

Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 3:10 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.e.kel...@intel.com writes: diff --git a/builtin/notes.c b/builtin/notes.c index 12a42b583f98..bdfd9c7d29b4 100644 ---

[PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-14 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new option notes.ref.mergestrategy option which specifies the merge strategy for merging into a given notes ref. This option enables selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want

Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 3:01 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.e.kel...@intel.com writes: diff --git a/builtin/notes.c b/builtin/notes.c index 12a42b583f98..bdfd9c7d29b4 100644 --- a/builtin/notes.c +++ b/builtin/notes.c ... @@ -833,7 +833,14 @@ static int

Re: [PATCH v7 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-14 Thread Junio C Hamano
Jacob Keller jacob.e.kel...@intel.com writes: diff --git a/builtin/notes.c b/builtin/notes.c index 12a42b583f98..bdfd9c7d29b4 100644 --- a/builtin/notes.c +++ b/builtin/notes.c ... @@ -833,7 +833,14 @@ static int merge(int argc, const char **argv, const char *prefix)