git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jacob Keller <jacob.keller@gmail.com>
Date
Dec 29, 2015, 02:56 UTC
Message-ID
<CA+P7+xp5+zqL43UJfdzsnQ9dBbufkUbaHk95W0j6L8j-L6KzAw@mail.gmail.com>
In-Reply-To
<xmqqbn9ajg1x.fsf@gitster.mtv.corp.google.com>
On Mon, Dec 28, 2015 at 3:42 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 26 quoted lines
> Jacob Keller <jacob.e.keller@intel.com> writes:
>
>> From: Jacob Keller <jacob.keller@gmail.com>
>>
>> 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 ref can be located using
>> get_sha1. Otherwise, it may be updated as done by expand_notes_ref.
>>
>> Since we now support merging from non-notes refs, remove the test case
>> associated with that behavior. Add a test case for merging from a
>> non-notes ref.
>>
>> Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
>> ---
>> Dropping the version number since this is a resend of a very old patch
>> and Junio already said he had dropped it from queue.
>
> 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.
>
> Thanks.
>
>

Some of them have reviewed previous versions, and I believe I have Cc'ed them again with this patch.

http://article.gmane.org/gmane.comp.version-control.git/281323
Hopefully they will have some time to look at this again.

Regards, Jake

Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 4 in “notes: allow merging from arbitrary references”
  1. notes: allow merging from arbitrary referencesJacob Keller, Dec 28, 2015
  2. Junio C HamanoDec 28, 2015
  3. Jacob KellerDec 29, 2015
  4. Junio C HamanoDec 29, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.