From: Jacob Keller Date: Wed, 12 Aug 2015 19:05:50 GMT Subject: Re: [PATCH v4 4/4] notes: teach git-notes about notes..merge option Message-ID: In-Reply-To: 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 can presume that the local notes ref must live under refs/notes/*, >> and hence drop the "refs/notes/" prefix from the config key (just like >> branch..* can presume that lives under refs/heads/*). > > I am OK going in that direction, as long as we promise that "notes > merge" will forever refuse to work on --notes=$ref where $ref does > not begin with refs/notes/. > It appears that notes merge already allows operating on refs not in "refs/notes" the way you select what you are merging into is via either --ref or the environment variable.I chose to use the full refs/notes/* format as it was the only one that also supported all layouts. So, should we enforce that default_notes_ref always requires refs inside refs/notes? that doesn't seem a bad idea here. If we only disallow it for merge I think that would be very confusing. Regards, Jake