Jacob Keller 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 it isn't. It is "w
Jacob Keller 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 code. We c
On Fri, Aug 14, 2015 at 11:13 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Add new option "notes..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
On Fri, Aug 14, 2015 at 3:10 PM, Eric Sunshine wrote:
> On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano wrote:
>> Jacob Keller writes:
>>> diff --git a/builtin/notes.c b/builtin/notes.c
>>> index 12a42b583f98..bdfd9c7d29b4 100644
>>> --- a/builtin/notes.c
>>> +++ b/builtin/notes.c
>>> +
On Fri, Aug 14, 2015 at 3:01 PM, Junio C Hamano wrote:
> Jacob Keller 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 **arg
On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano wrote:
> Jacob Keller 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, "notes.%s.mergestrategy", short_ref
Jacob Keller 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)
> usage_with_opti
From: Jacob Keller
Add new option "notes..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 cat_sort_uniq for all refs, but
8 matches
Mail list logo
