On Mon, Dec 28, 2015 at 3:42 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jacob Keller <jacob.e.keller@xxxxxxxxx> writes: > >> From: Jacob Keller <jacob.keller@xxxxxxxxx> >> >> 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@xxxxxxxxx> >> --- >> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html