Re: [PATCH v2] notes: allow merging from arbitrary references
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