Re: [PATCH] notes: allow merging from arbitrary references

Junio C Hamano writes: > OK, will try to queue again (but I am cutting an -rc today so it may > have to wait a bit). Those who have been involved in the notes topics > need to review it before the patch can make progress, though. Just FYI, with this the tip of 'pu' seems to

[PATCH] notes: allow merging from arbitrary references

From: Jacob Keller Create a new expansion function, expand_loose_notes_ref which will first check whether the ref can be found using get_sha1. If it can't be found then it will fallback to using expand_notes_ref. The content of the strbuf will not be changed if the notes

Re: [PATCH] notes: allow merging from arbitrary references

On Mon, Dec 28, 2015 at 3:42 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> Create a new expansion function, expand_loose_notes_ref which will first >> check whether the ref can be found using

Re: [PATCH] notes: allow merging from arbitrary references

Jacob Keller writes: > From: Jacob Keller > > Create a new expansion function, expand_loose_notes_ref which will first > check whether the ref can be found using get_sha1. If it can't be found > then it will fallback to using expand_notes_ref.

Re: [PATCH] notes: allow merging from arbitrary references

Jeff King writes: > On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote: > >> On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: >> >> > --- >> > I do not remember what version this was since it has been an age ago >> > that I sent the previous code. This is

Re: [PATCH] notes: allow merging from arbitrary references

On Fri, Dec 11, 2015 at 11:47 AM, Junio C Hamano wrote: > I'll discard the topic for now, expecting the resurrection sometime > later. > Hi, Yes I fully intend to work this against master once I have some time again. It may be a few weeks as I am extra busy for the holidays,

Re: [PATCH] notes: allow merging from arbitrary references

On Tue, Nov 24, 2015 at 3:42 PM, Jeff King wrote: > On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote: > >> On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: >> >> > --- >> > I do not remember what version this was since it has been an age ago >> > that I sent

Re: [PATCH] notes: allow merging from arbitrary references

On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: > --- > I do not remember what version this was since it has been an age ago > that I sent the previous code. This is mostly just a rebase onto current > next. I believe I have covered everything previous reviewers noted. Please keep

Re: [PATCH] notes: allow merging from arbitrary references

On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote: > On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: > > > --- > > I do not remember what version this was since it has been an age ago > > that I sent the previous code. This is mostly just a rebase onto current > > next. I

Re: [PATCH] notes: allow merging from arbitrary references

On Wed, Nov 18, 2015 at 2:29 PM, Johan Herland wrote: > On Mon, Nov 16, 2015 at 8:41 PM, Jacob Keller wrote: >> The main other issue is how to get notes DWIM things to work for all >> cases where we want to use notes refs, since right now the DWIM is >>

Re: [PATCH] notes: allow merging from arbitrary references

On Mon, Nov 16, 2015 at 8:41 PM, Jacob Keller wrote: > The main other issue is how to get notes DWIM things to work for all > cases where we want to use notes refs, since right now the DWIM is > basically done at the top level and only handles notes like things. > The

Re: [PATCH] notes: allow merging from arbitrary references

On Sun, Nov 15, 2015 at 11:55 PM, Johan Herland wrote: > Additionally, if we suspect that passing non-notes trees to read-only > operations will be a common error, we could add a simple heuristic to > the notes code, to warn (or even abort) if we strongly suspect that we > are

Re: [PATCH] notes: allow merging from arbitrary references

On Fri, Nov 13, 2015 at 5:34 PM, Jacob Keller wrote: > From: Jacob Keller > > Create a new expansion function, expand_loose_notes_ref which will > expand any ref using get_sha1, but falls back to expand_notes_ref if > this fails. The contents of

Re: [PATCH] notes: allow merging from arbitrary references

On Sun, Nov 15, 2015 at 2:14 PM, Johan Herland wrote: >> --- >> I do not remember what version this was since it has been an age ago >> that I sent the previous code. This is mostly just a rebase onto current >> next. I believe I have covered everything previous reviewers

Re: [PATCH] notes: allow merging from arbitrary references

On Mon, Nov 16, 2015 at 12:23 AM, Jacob Keller wrote: > On Sun, Nov 15, 2015 at 2:14 PM, Johan Herland wrote: >> A related topic that has been discussed (although I cannot remember if >> any conclusion was reached) is whether to allow more notes

[PATCH] notes: allow merging from arbitrary references

From: Jacob Keller Create a new expansion function, expand_loose_notes_ref which will expand any ref using get_sha1, but falls back to expand_notes_ref if this fails. The contents of the strbuf will be either the hex string of the sha1, or the expanded notes ref. It is

Re: [PATCH] notes: allow merging from arbitrary references

On Thu, Oct 1, 2015 at 3:39 PM, Jacob Keller wrote: > From: Jacob Keller > > Create a new expansion function, expand_loose_notes_ref which will > expand any ref using get_sha1, but falls back to expand_notes_ref if > this fails. The contents of

[PATCH] notes: allow merging from arbitrary references

From: Jacob Keller Create a new expansion function, expand_loose_notes_ref which will expand any ref using get_sha1, but falls back to expand_notes_ref if this fails. The contents of the strbuf will be either the hex string of the sha1, or the expanded notes ref. It is

Re: [PATCH] notes: allow merging from arbitrary references

On Thu, Oct 1, 2015 at 3:39 PM, Jacob Keller wrote: > From: Jacob Keller > > Create a new expansion function, expand_loose_notes_ref which will > expand any ref using get_sha1, but falls back to expand_notes_ref if > this fails. The contents of