On Thu, Oct 1, 2015 at 3:39 PM, Jacob Keller <jacob.e.kel...@intel.com> wrote: > From: Jacob Keller <jacob.kel...@gmail.com> > > 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 expected to be re-expanded > using get_sha1 inside the notes merge machinery, and there is no real > error checking provided at this layer. > > 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.kel...@gmail.com> > ---
Anyone have any comments on this one? It's basically Junio's suggestion of just using get_sha1 directly for the remote side of the notes merge... Regards, Jake -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
