diff options
author | Jacob Keller <jacob.keller@gmail.com> | 2015-12-29 14:40:28 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-01-17 13:59:01 -0800 |
commit | b3715b75226668e26f1f2abe7e2f93cdbbf6e2f5 (patch) | |
tree | b0d30e72a4bf580210ea8fbe3531b395eb233e3b /t/t4252/am-test-6-1 | |
parent | Git 2.7-rc3 (diff) | |
download | tgif-b3715b75226668e26f1f2abe7e2f93cdbbf6e2f5.tar.xz |
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>
Diffstat (limited to 't/t4252/am-test-6-1')
0 files changed, 0 insertions, 0 deletions