On Wed, Aug 12, 2015 at 3:41 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> I spoke to soon. We have an "init_notes_check" function which shows
>> that it does refuse to merge outside of refs/notes/* It prevents all
>> notes operations outside of refs/notes
>
> OK. Then it is OK to limit
Jacob Keller writes:
> I spoke to soon. We have an "init_notes_check" function which shows
> that it does refuse to merge outside of refs/notes/* It prevents all
> notes operations outside of refs/notes
OK. Then it is OK to limit notes..mergestrategy so that
refers to what comes after refs/not
On Wed, Aug 12, 2015 at 2:57 PM, Jacob Keller wrote:
> On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland wrote:
>> If we don't already refuse to merge into a ref outside refs/notes, then
>> I would consider that a bug to be fixed, and not some corner use case that
>> we must preserve for all future.
On Wed, Aug 12, 2015 at 11:43 PM, Jacob Keller wrote:
> On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller wrote:
>> Oh interesting. I did a test. If you provide a fully qualified ref not
>> inside refs/notes, then it assumes you meant refs/notes/refs/foo/y
>> rather than refs/foo/y
>>
>> I need to d
On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland wrote:
> If we don't already refuse to merge into a ref outside refs/notes, then
> I would consider that a bug to be fixed, and not some corner use case that
> we must preserve for all future.
>
> After all, we do already have a test in t3308 named 'f
On Wed, Aug 12, 2015 at 4:26 AM, Junio C Hamano wrote:
> Johan Herland writes:
>> I know that we don't yet have a "proper" place to put remote notes refs,
>> but the in notes..merge _must_ be a "local" notes ref (you even
>> use the notation in the documentation below). Thus, I believe
>> we ca
On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller wrote:
> Oh interesting. I did a test. If you provide a fully qualified ref not
> inside refs/notes, then it assumes you meant refs/notes/refs/foo/y
> rather than refs/foo/y
>
> I need to do some more digging on this to determine the exact thing going
On Wed, Aug 12, 2015 at 12:09 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano wrote:
>>> Johan Herland writes:
>>>
I know that we don't yet have a "proper" place to put remote notes refs,
but the in notes..merge _must_ be a "local
Jacob Keller writes:
> On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano wrote:
>> Johan Herland writes:
>>
>>> I know that we don't yet have a "proper" place to put remote notes refs,
>>> but the in notes..merge _must_ be a "local" notes ref (you even
>>> use the notation in the documentation
On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano wrote:
> Johan Herland writes:
>
>> I know that we don't yet have a "proper" place to put remote notes refs,
>> but the in notes..merge _must_ be a "local" notes ref (you even
>> use the notation in the documentation below). Thus, I believe
>> we
Johan Herland writes:
> I know that we don't yet have a "proper" place to put remote notes refs,
> but the in notes..merge _must_ be a "local" notes ref (you even
> use the notation in the documentation below). Thus, I believe
> we can presume that the local notes ref must live under refs/notes
On Tue, Aug 11, 2015 at 10:57 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Add new option "notes..merge" 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 mer
On Tue, Aug 11, 2015 at 4:57 PM, Jacob Keller wrote:
> Add new option "notes..merge" 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
From: Jacob Keller
Add new option "notes..merge" 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
only som
14 matches
Mail list logo
