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

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

From
Johan Herland <johan@herland.net>
Date
Jan 17, 2016, 10:00 UTC
Message-ID
<CALKQrgfsnhpvqoEMjv40mvb_ZifgXddvimFugnXcMoQH-Hhi7A@mail.gmail.com>
In-Reply-To
<1452883636-27753-1-git-send-email-jacob.e.keller@intel.com>
On Fri, Jan 15, 2016 at 7:47 PM, Jacob Keller <jacob.e.keller@intel.com> wrote:
Show 24 quoted lines
> 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>
> ---
>
> Notes:
>     - v2
>     * don't expand notes-ref to the sha1, in order to support get-ref better
>     * fix failed tests due to mis-use of argv[0] instead of remote_ref.buf
>
> This is a resend, since no one reviewed this last time, and it's been a
> couple of weeks. At least one person has reviewed a previous version,
> but I'd like some fresh eyes on this latest version. This should be
> identical to the previous patch.
Reviewed-by: Johan Herland <johan@herland.net>
-- 
Johan Herland, <johan@herland.net>
www.herland.net
Previous: Jacob Keller
Message 2 of 2 in “notes: allow merging from arbitrary references”
  1. notes: allow merging from arbitrary referencesJacob Keller, Jan 15, 2016
  2. Johan HerlandJan 17, 2016

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.