From b3715b75226668e26f1f2abe7e2f93cdbbf6e2f5 Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Tue, 29 Dec 2015 14:40:28 -0800 Subject: notes: allow merging from arbitrary references 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 Reviewed-by: Johan Herland Signed-off-by: Junio C Hamano --- notes.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'notes.c') diff --git a/notes.c b/notes.c index db77922130..086cc483e5 100644 --- a/notes.c +++ b/notes.c @@ -1303,3 +1303,13 @@ void expand_notes_ref(struct strbuf *sb) else strbuf_insert(sb, 0, "refs/notes/", 11); } + +void expand_loose_notes_ref(struct strbuf *sb) +{ + unsigned char object[20]; + + if (get_sha1(sb->buf, object)) { + /* fallback to expand_notes_ref */ + expand_notes_ref(sb); + } +} -- cgit v1.2.3