notes: allow merging from arbitrary references
commitb3715b75226668e26f1f2abe7e2f93cdbbf6e2f5
authorJacob Keller <jacob.keller@gmail.com>
Tue, 29 Dec 2015 22:40:28 +0000 (29 14:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2016 21:59:01 +0000 (17 13:59 -0800)
treeb0d30e72a4bf580210ea8fbe3531b395eb233e3b
parent28274d02c489f4c7e68153056e9061a46f62d7a0
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 <jacob.keller@gmail.com>
Reviewed-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/notes.c
notes.c
notes.h
t/t3308-notes-merge.sh